diff --git a/ChangeLog b/ChangeLog
index 769e4fb2a..1e05f770e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-26  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* Makefile.in (RMKFILES): Rewrite using $(wildcard).
+
 2009-10-26  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* disk/scsi.c: Remove `<grub/machine/kernel.h>' (not needed).
diff --git a/Makefile.in b/Makefile.in
index 80ed07124..bde80889b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,9 +115,7 @@ enable_efiemu = @enable_efiemu@
 
 ### General variables.
 
-RMKFILES = $(addprefix conf/,common.rmk i386-coreboot.rmk i386-efi.rmk \
-	i386-qemu.rmk i386-ieee1275.rmk i386-pc.rmk i386.rmk powerpc-ieee1275.rmk \
-	sparc64-ieee1275.rmk x86_64-efi.rmk)
+RMKFILES = $(wildcard conf/*.rmk)
 
 MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))