diff --git a/ChangeLog b/ChangeLog
index 51f7add85..66cbf5fdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-20  Robert Millan  <rmh@aybabtu.com>
+
+	* genmk.rb (Image): Copy `extra_flags' from here ...
+	(PModule): ... to here.  Use it in `#{obj}: #{src}' rule.
+
+	* commands/i386/cpuid.c (grub_cmd_cpuid): Add __attribute__ ((unused))
+	to `argc' and `args' arguments.
+
 2007-10-17  Robert Millan  <rmh@aybabtu.com>
 
 	* kern/i386/loader.S: New file.
diff --git a/commands/i386/cpuid.c b/commands/i386/cpuid.c
index bc1b1a746..62cf7f43b 100644
--- a/commands/i386/cpuid.c
+++ b/commands/i386/cpuid.c
@@ -41,9 +41,9 @@ static const struct grub_arg_option options[] =
   };
 
 static grub_err_t
-grub_cmd_cpuid (struct grub_arg_list *state __attribute__ ((unused)), int argc,
-	       char **args)
-
+grub_cmd_cpuid (struct grub_arg_list *state __attribute__ ((unused)),
+	       int argc __attribute__ ((unused)),
+	       char **args __attribute__ ((unused)))
 {
   return !has_longmode;
 }
diff --git a/genmk.rb b/genmk.rb
index a30e5fccd..25deddbd0 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -143,10 +143,11 @@ endif
       fs = 'fs-' + obj.suffix('lst')
       dep = deps[i]
       flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
+      extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end
       dir = File.dirname(src)
 
       "#{obj}: #{src}
-	$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $<
+	$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $<
 -include #{dep}
 
 CLEANFILES += #{command} #{fs}