--- qemu-0.8.2.old/Makefile.target	2006-07-22 19:23:34.000000000 +0200
+++ qemu-0.8.2/Makefile.target	2007-07-08 14:05:33.000000000 +0200
@@ -43,11 +43,7 @@
 QEMU_USER=qemu-$(TARGET_ARCH2)
 # system emulator name
 ifdef CONFIG_SOFTMMU
-ifeq ($(TARGET_ARCH), i386)
-QEMU_SYSTEM=qemu$(EXESUF)
-else
 QEMU_SYSTEM=qemu-system-$(TARGET_ARCH2)$(EXESUF)
-endif
 else
 QEMU_SYSTEM=qemu-fast
 endif
@@ -531,6 +527,13 @@
 install: all 
 ifneq ($(PROGS),)
 	$(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
+ifeq ($(ARCH), $(TARGET_ARCH2))
+ifdef _WIN32
+	mv "$(DESTDIR)$(bindir)/qemu-system-$(TARGET_ARCH2)$(EXESUF)" "$(DESTDIR)$(bindir)/qemu$(EXESUF)"
+else
+	ln -s qemu-system-$(TARGET_ARCH2)$(EXESUF) "$(DESTDIR)$(bindir)/qemu$(EXESUF)"
+endif
+endif
 endif
 
 ifneq ($(wildcard .depend),)