diff --git a/ChangeLog b/ChangeLog
index bc7af5def..1b750b4ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-05-16  Robert Millan  <rmh@aybabtu.com>
+
+	* include/grub/i386/pc/util/biosdisk.h: Moved to ...
+	* include/grub/util/biosdisk.h: ... here.
+	* util/i386/pc/biosdisk.c: Moved to ...
+	* util/biosdisk.c: ... here.
+	* util/i386/pc/getroot.c: Moved to ...
+	* util/getroot.c: ... here.
+	* util/i386/pc/grub-mkdevicemap.c: Moved to ...
+	* util/grub-mkdevicemap.c: ... here.
+	* util/i386/pc/grub-probe.c: Moved to ...
+	* util/grub-probe.c: ... here.
+
 2007-05-15  Robert Millan  <rmh@aybabtu.com>
 
 	* util/update-grub.in: Remove duplicated line in grub.cfg header
diff --git a/include/grub/i386/pc/util/biosdisk.h b/include/grub/util/biosdisk.h
similarity index 100%
rename from include/grub/i386/pc/util/biosdisk.h
rename to include/grub/util/biosdisk.h
diff --git a/util/i386/pc/biosdisk.c b/util/biosdisk.c
similarity index 100%
rename from util/i386/pc/biosdisk.c
rename to util/biosdisk.c
diff --git a/util/i386/pc/getroot.c b/util/getroot.c
similarity index 100%
rename from util/i386/pc/getroot.c
rename to util/getroot.c
diff --git a/util/i386/pc/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
similarity index 100%
rename from util/i386/pc/grub-mkdevicemap.c
rename to util/grub-mkdevicemap.c
diff --git a/util/i386/pc/grub-probe.c b/util/grub-probe.c
similarity index 100%
rename from util/i386/pc/grub-probe.c
rename to util/grub-probe.c