diff --git a/ChangeLog b/ChangeLog
index 085ce9f1c..5367d190f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-04  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	*  configure.ac: Explicitly disable emusdl, emuusb and emupci on non-
+	emu platforms.
+	* grub-core/Makefile.core.def: Enable emupci and emuucb only for emu.
+
 2013-11-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* docs/grub.texi: Document usage of menuentry id.
diff --git a/configure.ac b/configure.ac
index 4df64f886..1094b9249 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1026,6 +1026,13 @@ fi
 AC_SUBST([enable_grub_emu_sdl])
 AC_SUBST([enable_grub_emu_usb])
 AC_SUBST([enable_grub_emu_pci])
+
+else
+
+# Ignore --enable-emu-* if platform is not emu
+enable_grub_emu_sdl=no
+enable_grub_emu_usb=no
+enable_grub_emu_pci=no
 fi
 
 AC_ARG_ENABLE([grub-mkfont],
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 0878f0102..199016103 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -497,6 +497,7 @@ module = {
 module = {
   name = emuusb;
   common = bus/usb/usb.c;
+  enable = emu;
   condition = COND_GRUB_EMU_USB;
 };
 
@@ -566,6 +567,7 @@ module = {
   common = bus/emu/pci.c;
   common = commands/lspci.c;
 
+  enable = emu;
   condition = COND_GRUB_EMU_PCI;
 };