diff --git a/configure.common b/configure.common
index 51a0caec4..8c100e2da 100644
--- a/configure.common
+++ b/configure.common
@@ -762,6 +762,23 @@ AC_SUBST([enable_grub_mkfont])
 AC_SUBST([freetype_cflags])
 AC_SUBST([freetype_libs])
 
+AC_ARG_ENABLE([device-mapper],
+              [AS_HELP_STRING([--enable-device-mapper],
+                              [enable Linux device-mapper support (default=guessed)])])
+if test x"$enable_device_mapper" = xno ; then
+  device_mapper_excuse="explicitly disabled"
+fi
+
+if test x"$device_mapper_excuse" = x ; then
+  # Check for device-mapper library.
+  AC_CHECK_LIB([devmapper], [dm_task_create],
+               [LDFLAGS="$LDFLAGS -ldevmapper"
+                AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
+                          [Define to 1 if you have the devmapper library.])],
+               [device_mapper_excuse="need devmapper library"])
+fi
+AC_SUBST(ASFLAGS)
+
 AC_SUBST([FONT_SOURCE])
 AS_IF([test x$target_cpu = xi386 -a x$platform = xpc],
 	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
diff --git a/grub-core/include/grub/cache.h b/grub-core/include/grub/cache.h
index a54bc00f8..27e44f0a2 100644
--- a/grub-core/include/grub/cache.h
+++ b/grub-core/include/grub/cache.h
@@ -23,8 +23,7 @@
 #include <grub/symbol.h>
 #include <grub/types.h>
 
-#if defined (__i386__) || defined (__x86_64__) || \
-  (defined (GRUB_MACHINE_EMU) && GRUB_MACHINE_EMU)
+#if defined (__i386__) || defined (__x86_64__)
 static inline void
 grub_arch_sync_caches (void *address __attribute__ ((unused)),
 		       grub_size_t len __attribute__ ((unused)))
diff --git a/grub-core/include/grub/dl.h b/grub-core/include/grub/dl.h
index 2a10cfaef..4ed68b69a 100644
--- a/grub-core/include/grub/dl.h
+++ b/grub-core/include/grub/dl.h
@@ -111,7 +111,7 @@ grub_err_t EXPORT_FUNC(grub_dl_register_symbol) (const char *name, void *addr,
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 
-#if defined (_mips) && (! defined (GRUB_MACHINE_EMU) || ! GRUB_MACHINE_EMU)
+#if defined (_mips)
 #define GRUB_LINKER_HAVE_INIT 1
 void grub_arch_dl_init_linker (void);
 #endif
diff --git a/grub-core/include/grub/misc.h b/grub-core/include/grub/misc.h
index 1ec8bbc5a..077069934 100644
--- a/grub-core/include/grub/misc.h
+++ b/grub-core/include/grub/misc.h
@@ -50,9 +50,6 @@
 /* XXX: If grub_memmove is too slow, we must implement grub_memcpy.  */
 #define grub_memcpy(d,s,n)	grub_memmove ((d), (s), (n))
 
-/* Flag to control module autoloading in normal mode.  */
-extern int EXPORT_VAR(grub_no_autoload);
-
 void *EXPORT_FUNC(grub_memmove) (void *dest, const void *src, grub_size_t n);
 char *EXPORT_FUNC(grub_strcpy) (char *dest, const char *src);
 char *EXPORT_FUNC(grub_strncpy) (char *dest, const char *src, int c);
@@ -311,4 +308,11 @@ void EXPORT_FUNC (grub_halt) (int no_apm);
 void EXPORT_FUNC (grub_halt) (void);
 #endif
 
+#ifdef GRUB_MACHINE_EMU
+/* Flag to control module autoloading in normal mode.  */
+extern int EXPORT_VAR(grub_no_autoload);
+#else
+#define grub_no_autoload 0
+#endif
+
 #endif /* ! GRUB_MISC_HEADER */
diff --git a/grub-core/kern/emu/cache.S b/grub-core/kern/emu/cache.S
index 9975578b8..90a5b5396 100644
--- a/grub-core/kern/emu/cache.S
+++ b/grub-core/kern/emu/cache.S
@@ -2,17 +2,13 @@
 #error "This source is only meant for grub-emu platform"
 #endif
 
-#if defined(GRUB_CPU_I386)
+#if defined(__i386__) || defined(__x86_64__)
 /* Nothing is necessary.  */
-#elif defined(GRUB_CPU_X86_64)
-/* Nothing is necessary.  */
-#elif defined(GRUB_CPU_SPARC64)
+#elif defined(__sparc__)
 #include "../sparc64/cache.S"
-#elif defined(GRUB_CPU_MIPS)
+#elif defined(__mips__)
 #include "../mips/cache.S"
-#elif defined(GRUB_CPU_MIPSEL)
-#include "../mips/cache.S"
-#elif defined(GRUB_CPU_POWERPC)
+#elif defined(__powerpc__)
 #include "../powerpc/cache.S"
 #else
 #error "No target cpu type is defined"
diff --git a/grub-core/kern/emu/lite.c b/grub-core/kern/emu/lite.c
index 884ddee10..9b3728717 100644
--- a/grub-core/kern/emu/lite.c
+++ b/grub-core/kern/emu/lite.c
@@ -5,17 +5,15 @@
 #error "This source is only meant for grub-emu platform"
 #endif
 
-#if defined(GRUB_CPU_I386)
+#if defined(__i386__)
 #include "../i386/dl.c"
-#elif defined(GRUB_CPU_X86_64)
+#elif defined(__x86_64__)
 #include "../x86_64/dl.c"
-#elif defined(GRUB_CPU_SPARC64)
+#elif defined(__sparc__)
 #include "../sparc64/dl.c"
-#elif defined(GRUB_CPU_MIPS)
+#elif defined(__mips__)
 #include "../mips/dl.c"
-#elif defined(GRUB_CPU_MIPSEL)
-#include "../mips/dl.c"
-#elif defined(GRUB_CPU_POWERPC)
+#elif defined(__powerpc__)
 #include "../powerpc/dl.c"
 #else
 #error "No target cpu type is defined"
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 73a7b1078..59f5934e6 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -52,6 +52,8 @@ static jmp_buf main_env;
 /* Store the prefix specified by an argument.  */
 static char *prefix = NULL;
 
+int grub_no_autoload;
+
 grub_addr_t
 grub_arch_modules_addr (void)
 {
@@ -203,7 +205,6 @@ main (int argc, char *argv[])
   /* XXX: This is a bit unportable.  */
   grub_util_biosdisk_init (dev_map);
 
-  /* Initialize all embedded modules.  */
   grub_init_all ();
 
   /* Make sure that there is a root device.  */
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
index 2541d3295..1fdf4ab07 100644
--- a/grub-core/kern/main.c
+++ b/grub-core/kern/main.c
@@ -30,8 +30,6 @@
 #include <grub/reader.h>
 #include <grub/parser.h>
 
-int grub_no_autoload;
-
 void
 grub_module_iterate (int (*hook) (struct grub_module_header *header))
 {