diff --git a/ChangeLog b/ChangeLog
index ae706c8c..c29cd2d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-23  Marc Autret  <autret_m@epita.fr>
+
+	* src/files.c (compute_header_macro): Computes header macro name
+	from spec_defines_file when given.
+
 2001-09-23  Marc Autret  <autret_m@epita.fr>
 
 	* src/files.c (output_files): Add default extensions.
diff --git a/src/files.c b/src/files.c
index 2a4c313c..6084140c 100644
--- a/src/files.c
+++ b/src/files.c
@@ -97,13 +97,18 @@ compute_header_macro (void)
 {
   int ite;
   char *macro_name;
-
-  macro_name = XMALLOC (char,
-			strlen (base_name) +
-			strlen (header_extension) + 1);
-
-  stpcpy (macro_name, base_name);
-  strcat (macro_name, header_extension);
+  
+  if (spec_defines_file)
+    macro_name = xstrdup (spec_defines_file);
+  else
+    {
+      macro_name = XMALLOC (char,
+			    strlen (base_name) +
+			    strlen (header_extension) + 1);
+      
+      stpcpy (macro_name, base_name);
+      strcat (macro_name, header_extension);
+    }
 
   for (ite = 0; macro_name[ite]; ite++)
     if (macro_name[ite] == '.')