diff --git a/ChangeLog b/ChangeLog
index b4f11abee..c32682f2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-12  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/i386/pc/grub-install.in: Move from here ...
+	* util/grub-install.in: ... to here.  Update all users.
+
 2009-11-11  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/powerpc/ieee1275/grub-mkrescue.in: Fix --version output.
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 5645395b8..b65833776 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -150,7 +150,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 grub_emu_LDFLAGS = $(LIBCURSES)
 
 sbin_SCRIPTS += grub-install
-grub_install_SOURCES = util/i386/pc/grub-install.in
+grub_install_SOURCES = util/grub-install.in
 
 bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/i386/coreboot/grub-mkrescue.in
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 373b942cc..74b88f0df 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -173,7 +173,7 @@ sbin_SCRIPTS = grub-install
 bin_SCRIPTS = grub-mkrescue
 
 # For grub-install.
-grub_install_SOURCES = util/i386/pc/grub-install.in
+grub_install_SOURCES = util/grub-install.in
 
 # For grub-mkrescue.
 grub_mkrescue_SOURCES = util/i386/pc/grub-mkrescue.in
diff --git a/util/i386/pc/grub-install.in b/util/grub-install.in
similarity index 100%
rename from util/i386/pc/grub-install.in
rename to util/grub-install.in