diff --git a/ChangeLog b/ChangeLog
index a8bd9ad94..edb717377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-07-13  Pavel Roskin  <proski@gnu.org>
 
+	* kern/dl.c: Force native word size to suppress warnings when
+	compiling grub-emu.
+
 	* kern/device.c (grub_device_iterate): Change struct part_ent to
 	hold the name, not a pointer to it.  Use one grub_malloc() per
 	partition, not two.  Free partition_name if grub_malloc() fails.
diff --git a/kern/dl.c b/kern/dl.c
index 6c863be6f..122b6b90e 100644
--- a/kern/dl.c
+++ b/kern/dl.c
@@ -17,6 +17,9 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/* Force native word size */
+#define GRUB_TARGET_WORDSIZE (8 * GRUB_CPU_SIZEOF_VOID_P)
+
 #include <config.h>
 #include <grub/elf.h>
 #include <grub/dl.h>