diff --git a/ChangeLog b/ChangeLog
index de0b62f08..d88c510eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* conf/any-emu.rmk (kernel_img_SOURCES) [!x86]: Include
+	kern/$(target_cpu)/cache.S even if TARGET_NO_MODULES = yes.
+
 2010-06-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	Add btrfs probing support, currently only in the single-device case.
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 000996172..21e139a32 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -20,14 +20,14 @@ TARGET_NO_STRIP = yes
 
 ifneq ($(TARGET_NO_MODULES), yes)
 kernel_img_SOURCES += symlist.c kern/$(target_cpu)/dl.c
+else
+kernel_img_SOURCES += grub_emu_init.c
+endif
 ifneq ($(target_cpu), i386)
 ifneq ($(target_cpu), x86_64)
 kernel_img_SOURCES += kern/$(target_cpu)/cache.S
 endif
 endif
-else
-kernel_img_SOURCES += grub_emu_init.c
-endif
 
 # For halt.mod.
 pkglib_MODULES += halt.mod