diff --git a/src/ChangeLog b/src/ChangeLog
index 3e24370d724..254069032ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-06  John Paul Wallington  <jpw@gnu.org>
+
+	* eval.c (Fdefmacro): Signal an error if NAME is not a symbol.
+
 2004-07-05  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* macterm.c (mac_initialize_display_info): Use CGGetActiveDisplayList
diff --git a/src/eval.c b/src/eval.c
index 096755f9c77..d7cfe959158 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -657,6 +657,7 @@ usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...)  */)
   Lisp_Object lambda_list, doc, tail;
 
   fn_name = Fcar (args);
+  CHECK_SYMBOL (fn_name);
   lambda_list = Fcar (Fcdr (args));
   tail = Fcdr (Fcdr (args));