diff --git a/conf/mips-qemu-r4k.rmk b/conf/mips-qemu-mips.rmk
similarity index 84%
rename from conf/mips-qemu-r4k.rmk
rename to conf/mips-qemu-mips.rmk
index ec14d9336..d5a985a13 100644
--- a/conf/mips-qemu-r4k.rmk
+++ b/conf/mips-qemu-mips.rmk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 LINK_BASE = 0x80010000
-target_machine=qemu-r4k
+target_machine=qemu-mips
 COMMON_CFLAGS += -march=mips3
 COMMON_ASFLAGS += -march=mips3
 include $(srcdir)/conf/mips.mk
diff --git a/configure.ac b/configure.ac
index f08195c37..8b089ee58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,7 @@ case "$target_cpu"-"$platform" in
   i386-qemu) ;;
   powerpc-ieee1275) ;;
   sparc64-ieee1275) ;;
-  mips-qemu-r4k) ;;
+  mips-qemu-mips) ;;
   mips-yeeloong) ;;
   *-emu) ;;
   *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
@@ -134,7 +134,7 @@ case "$platform" in
   pc)		machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
   emu)		machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
   yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu-r4k)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 esac
 CFLAGS="$CFLAGS $machine_CFLAGS"
 TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
diff --git a/include/grub/mips/qemu-r4k/boot.h b/include/grub/mips/qemu-mips/boot.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/boot.h
rename to include/grub/mips/qemu-mips/boot.h
diff --git a/include/grub/mips/qemu-r4k/kernel.h b/include/grub/mips/qemu-mips/kernel.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/kernel.h
rename to include/grub/mips/qemu-mips/kernel.h
diff --git a/include/grub/mips/qemu-r4k/loader.h b/include/grub/mips/qemu-mips/loader.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/loader.h
rename to include/grub/mips/qemu-mips/loader.h
diff --git a/include/grub/mips/qemu-r4k/machine.h b/include/grub/mips/qemu-mips/machine.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/machine.h
rename to include/grub/mips/qemu-mips/machine.h
diff --git a/include/grub/mips/qemu-r4k/memory.h b/include/grub/mips/qemu-mips/memory.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/memory.h
rename to include/grub/mips/qemu-mips/memory.h
diff --git a/include/grub/mips/qemu-r4k/serial.h b/include/grub/mips/qemu-mips/serial.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/serial.h
rename to include/grub/mips/qemu-mips/serial.h
diff --git a/include/grub/mips/qemu-r4k/time.h b/include/grub/mips/qemu-mips/time.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/time.h
rename to include/grub/mips/qemu-mips/time.h
diff --git a/kern/mips/qemu-r4k/init.c b/kern/mips/qemu-mips/init.c
similarity index 100%
rename from kern/mips/qemu-r4k/init.c
rename to kern/mips/qemu-mips/init.c