diff --git a/ChangeLog b/ChangeLog
index 46c96bdb2..33b0ea3bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix warnings in grub-emu when compiling with maximum warning options.
+
+	* util/grub-emu.c (ENABLE_RELOCATABLE): New definition.
+	(grub_arch_modules_addr): Return 0 and not NULL.
+	* util/misc.c (ENABLE_RELOCATABLE): New definition.
+	(xstrdup): USe newstr instead of dup.
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/i386/linux.c (grub_linux_setup_video): Handle error
diff --git a/util/grub-emu.c b/util/grub-emu.c
index 21fc6fa09..554556ae8 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -40,6 +40,7 @@
 
 #include <grub_emu_init.h>
 
+#define ENABLE_RELOCATABLE 0
 #include "progname.h"
 
 /* Used for going back to the main function.  */
@@ -51,7 +52,7 @@ static char *prefix = NULL;
 grub_addr_t
 grub_arch_modules_addr (void)
 {
-  return NULL;
+  return 0;
 }
 
 grub_err_t
diff --git a/util/misc.c b/util/misc.c
index 4e8eec323..8c79e8d9b 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -43,6 +43,7 @@
 #include <grub/time.h>
 #include <grub/i18n.h>
 
+#define ENABLE_RELOCATABLE 0
 #include "progname.h"
 
 /* Include malloc.h, only if memalign is available. It is known that
@@ -142,13 +143,13 @@ char *
 xstrdup (const char *str)
 {
   size_t len;
-  char *dup;
+  char *newstr;
 
   len = strlen (str);
-  dup = (char *) xmalloc (len + 1);
-  memcpy (dup, str, len + 1);
+  newstr = (char *) xmalloc (len + 1);
+  memcpy (newstr, str, len + 1);
 
-  return dup;
+  return newstr;
 }
 
 char *