diff --git a/Makefile.target b/Makefile.target
index ce7473f..a9a4697 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -47,6 +47,7 @@
 libobj-$(CONFIG_SOFTFLOAT) += fpu/softfloat.o
 libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o
 libobj-y += op_helper.o helper.o
+libobj-$(CONFIG_NEED_MMU) += mmu.o
 
 ifeq ($(TARGET_BASE_ARCH), arm)
 libobj-y += neon_helper.o iwmmxt_helper.o
@@ -58,8 +59,6 @@
 
 ifeq ($(TARGET_BASE_ARCH), cris)
 libobj-y += cris-dis.o
-
-libobj-$(CONFIG_SOFTMMU) += mmu.o
 endif
 
 # NOTE: the disassembler code is only needed for debugging
@@ -79,7 +78,6 @@
 endif
 ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze)
 libobj-y += microblaze-dis.o
-libobj-$(CONFIG_SOFTMMU) += mmu.o
 endif
 ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips)
 libobj-y += mips-dis.o
diff --git a/configure b/configure
index a252dff..e0ef054 100755
--- a/configure
+++ b/configure
@@ -2088,6 +2088,12 @@
 ;;
 esac
 
+if test "$target_softmmu" = "yes" -a \( \
+        "$TARGET_ARCH" = "microblaze" -o \
+        "$TARGET_ARCH" = "cris" \) ; then
+  echo "CONFIG_NEED_MMU=y" >> $config_mak
+fi
+
 if test "$gprof" = "yes" ; then
   echo "TARGET_GPROF=yes" >> $config_mak
   if test "$target_linux_user" = "yes" ; then