diff --git a/ChangeLog b/ChangeLog
index c79817c22..7ef795336 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-16  Felix Zielcke  <fzielcke@z-51.de>
+
+	* conf/i386.rmk (setjmp_mod_CFLAGS): Rename to ...
+	(setjmp_mod_ASFLAGS): ... this. Set to $(COMMON_ASFLAGS)
+
 2009-05-16  Felix Zielcke  <fzielcke@z-51.de>
 
 	* util/grub-mkconfig.in: Export GRUB_TERMINAL_INPUT.
diff --git a/conf/i386.rmk b/conf/i386.rmk
index e8e2857cb..89496aef8 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -18,5 +18,5 @@ vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
 # For setjmp.mod
 pkglib_MODULES += setjmp.mod
 setjmp_mod_SOURCES = lib/i386/setjmp.S
-setjmp_mod_CFLAGS = $(COMMON_CFLAGS)
+setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
 setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)