diff --git a/ChangeLog b/ChangeLog
index 7ef795336..7b33c38f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
 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)
+	(setjmp_mod_ASFLAGS): ... this. Set to $(COMMON_ASFLAGS).
+	* conf/x86_64-efi.rmk (setjmp_mod_CFLAGS): Rename to ...
+	(setjmp_mod_ASFLAGS): ... this. Set to $(COMMON_ASFLAGS).
+	* conf/powerpc-ieee1275.rmk (setjmp_mod_CFLAGS): Rename to ...
+	(setjmp_mod_ASFLAGS): ... this. Set to $(COMMON_ASFLAGS).
+	* conf/sparc64-ieee1275.rmk (setjmp_mod_CFLAGS): Rename to ...
+	(setjmp_mod_ASFLAGS): ... this. Set to $(COMMON_ASFLAGS).
 
 2009-05-16  Felix Zielcke  <fzielcke@z-51.de>
 
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index bf0dd49bb..8b5be2bba 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -159,7 +159,7 @@ lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 # For setjmp.mod
 pkglib_MODULES += setjmp.mod
 setjmp_mod_SOURCES = lib/powerpc/setjmp.S
-setjmp_mod_CFLAGS = $(COMMON_CFLAGS)
+setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
 setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 include $(srcdir)/conf/common.mk
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 234f80122..d16501bdc 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -177,7 +177,7 @@ lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 # For setjmp.mod
 pkglib_MODULES += setjmp.mod
 setjmp_mod_SOURCES = lib/sparc64/setjmp.S
-setjmp_mod_CFLAGS = $(COMMON_CFLAGS)
+setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
 setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 include $(srcdir)/conf/common.mk
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index d25b03a4c..391cda312 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -196,7 +196,7 @@ xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
 # For setjmp.mod
 pkglib_MODULES += setjmp.mod
 setjmp_mod_SOURCES = lib/x86_64/setjmp.S
-setjmp_mod_CFLAGS = $(COMMON_CFLAGS)
+setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
 setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 include $(srcdir)/conf/common.mk