diff --git a/ChangeLog b/ChangeLog
index eeca20a6a..8155c7584 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2008-09-09  Felix Zielcke  <fzielcke@z-51.de>
 
-	* util/hostdisk.c: Change #include <grub/util/biosdisk.h> to
+	* Makefile.in (RMKFILES): Add `i386.rmk' and `x86_64-efi.rmk'.
+	Sort the list.
+
+2008-09-09  Felix Zielcke  <fzielcke@z-51.de>
+
+	* util/hostdisk.c: Replace #include <grub/util/biosdisk.h> with
 	#include <grub/util/hostdisk.h>.
 
 2008-09-08  Robert Millan  <rmh@aybabtu.com>
diff --git a/Makefile.in b/Makefile.in
index 613797442..57a1f0a3f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -98,8 +98,10 @@ enable_lzo = @enable_lzo@
 
 ### General variables.
 
-RMKFILES = $(addprefix conf/,common.rmk i386-pc.rmk powerpc-ieee1275.rmk \
-	sparc64-ieee1275.rmk i386-efi.rmk i386-ieee1275.rmk i386-coreboot.rmk)
+RMKFILES = $(addprefix conf/,common.rmk i386-coreboot.rmk i386-efi.rmk \
+	i386-ieee1275.rmk i386-pc.rmk i386.rmk powerpc-ieee1275.rmk \
+	sparc64-ieee1275.rmk x86_64-efi.rmk)
+
 MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
 
 PKGLIB = $(pkglib_IMAGES) $(pkglib_MODULES) $(pkglib_PROGRAMS) \