diff -up openmsx-0.6.3/build/cpu-ppc.mk.foo openmsx-0.6.3/build/cpu-ppc.mk
--- openmsx-0.6.3/build/cpu-ppc.mk.foo	2007-12-09 22:09:11.000000000 +0100
+++ openmsx-0.6.3/build/cpu-ppc.mk	2008-09-08 08:53:33.000000000 +0200
@@ -6,5 +6,5 @@
 BIG_ENDIAN:=true
 
 # Default build flavour.
-OPENMSX_FLAVOUR?=ppc
+OPENMSX_FLAVOUR?=rpm
 
diff -up openmsx-0.6.3/build/cpu-x86.mk.foo openmsx-0.6.3/build/cpu-x86.mk
--- openmsx-0.6.3/build/cpu-x86.mk.foo	2007-12-09 22:09:11.000000000 +0100
+++ openmsx-0.6.3/build/cpu-x86.mk	2008-09-08 08:53:33.000000000 +0200
@@ -12,7 +12,7 @@ UNALIGNED_MEMORY_ACCESS:=true
 ifeq ($(filter darwin%,$(OPENMSX_TARGET_OS)),)
 # To run openMSX with decent speed, at least a Pentium 2 class machine
 # is needed, so let's optimise for that.
-OPENMSX_FLAVOUR?=i686
+OPENMSX_FLAVOUR?=rpm
 else
 # The system headers of OS X use SSE features, which are not available on
 # i686, so we only use the generic optimisation flags instead.
diff -up openmsx-0.6.3/build/cpu-x86_64.mk.foo openmsx-0.6.3/build/cpu-x86_64.mk
--- openmsx-0.6.3/build/cpu-x86_64.mk.foo	2007-12-09 22:09:11.000000000 +0100
+++ openmsx-0.6.3/build/cpu-x86_64.mk	2008-09-08 08:53:33.000000000 +0200
@@ -9,5 +9,5 @@ BIG_ENDIAN:=false
 UNALIGNED_MEMORY_ACCESS:=true
 
 # Default build flavour.
-OPENMSX_FLAVOUR?=opt
+OPENMSX_FLAVOUR?=rpm