diff --git a/ChangeLog b/ChangeLog
index f0b1781f6..6ffa0d779 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-08  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/grub-dumpdevtree: Moved from here ...
+	* util/i386/efi/grub-dumpdevtree: ... to here.
+	(hexify): New function.  Converts a string to its hex version.
+	Generate hex versions of "efi" and "device-properties" by calling
+	hexify() on the ASCII strings rather than by hardcoding numbers.
+
 2009-08-08  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* fs/jfs.c: Update copyright year.
diff --git a/util/grub-dumpdevtree b/util/grub-dumpdevtree
deleted file mode 100644
index ca1a6a907..000000000
--- a/util/grub-dumpdevtree
+++ /dev/null
@@ -1,3 +0,0 @@
-echo "656669{	6465766963652d70726f70657274696573:"
-ioreg -lw0 -p IODeviceTree -n efi -r -x |grep device-properties | sed 's/.*<//;s/>.*//;'
-echo ";}"
diff --git a/util/i386/efi/grub-dumpdevtree b/util/i386/efi/grub-dumpdevtree
new file mode 100644
index 000000000..bc13e3c35
--- /dev/null
+++ b/util/i386/efi/grub-dumpdevtree
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Copyright (C) 2009  Free Software Foundation, Inc.
+#
+# GRUB is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GRUB is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+
+hexify()
+{
+  echo -n "$@" | od -A n -t x1 - | sed -e 's/ //g' | tr '\n' '\0'
+}
+
+echo "`hexify efi`{	`hexify device-properties`:"
+ioreg -lw0 -p IODeviceTree -n efi -r -x |grep device-properties | sed 's/.*<//;s/>.*//;'
+echo ";}"