diff --git a/ChangeLog b/ChangeLog
index 0428b02521..71ddb75bda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2000-10-04  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+	* src/mathed/math_parser.C (LexInitCodes): set lexcode of "@" to
+	LexAlpha. 
+
+	* src/mathed/formula.C (LocalDispatch): add '@' as an LM_TC_VAR
+	character. 
+
+	* lib/layouts/amsart.layout: include lyxmacros.inc, so that
+	LyX-Code is defined.
+	* lib/layouts/amsbook.layout: ditto.
+
+	* boost/Makefile.am: fix typo. 
+
 	* src/frontends/xforms/Menubar_pimpl.C (create_submenu): use
 	Menu::expand. 
 	(add_lastfiles): removed.
diff --git a/boost/Makefile.am b/boost/Makefile.am
index fc3cdb8c5c..a013476ae9 100644
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -2,4 +2,4 @@ DISTCLEANFILES= *.orig *.rej *~ *.bak core
 MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
 ETAGS_ARGS = --lang=c++
 
-EXTRADIST = boost libs
+EXTRA_DIST = boost libs
diff --git a/lib/layouts/amsart.layout b/lib/layouts/amsart.layout
index e974513162..6e8ab40a4b 100644
--- a/lib/layouts/amsart.layout
+++ b/lib/layouts/amsart.layout
@@ -99,7 +99,7 @@ NoStyle Verse    # Although mathematicians tend to be poets at times,
 
 
 Input stdlists.inc
-
+Input lyxmacros.inc
 
 ### Finally a few obsolete definitions for compatibility
 Input obsolete.inc
diff --git a/lib/layouts/amsbook.layout b/lib/layouts/amsbook.layout
index 00e669068c..0a73227929 100644
--- a/lib/layouts/amsbook.layout
+++ b/lib/layouts/amsbook.layout
@@ -128,6 +128,8 @@ Style Chapter_Exercises
 
 End
 
+Input lyxmacros.inc
+
 ### Finally a few obsolete definitions for compatibility
 Input obsolete.inc
 
diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index 611e4d2a4f..75e49f5ca5 100644
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -1202,7 +1202,7 @@ InsetFormula::LocalDispatch(BufferView * bv,
 		    result = FINISHED;
 	      }
 	   } else
-	   if (c == '\'') {
+	   if (c == '\'' || c == '@') {
 	      mathcursor->Insert (c, LM_TC_VAR);
 	   } else
 	   if (c == '\\') {
diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index ae85eaa062..621e85af68 100644
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -124,8 +124,11 @@ void LexInitCodes()
    lexcode['<'] = lexcode['>'] = lexcode['='] = LexBOP;
    
    lexcode['!'] = lexcode[','] = lexcode[':'] = lexcode[';'] = LexMathSpace;
-   lexcode['('] = lexcode[')'] = lexcode['|'] = lexcode['.'] = lexcode['?'] = LexOther; 
-   lexcode['\'']= LexAlpha;
+   
+   lexcode['('] = lexcode[')'] = lexcode['|'] = lexcode['.'] =
+   lexcode['?'] = LexOther; 
+
+   lexcode['\''] = lexcode['@'] = LexAlpha;
    
    lexcode['['] = lexcode[']'] = lexcode['^'] = lexcode['_'] = 
    lexcode['&'] = LexSelf;