diff --git a/compiler/utils/Makefile b/compiler/utils/Makefile
index bcb47a504b..0aff4e6b98 100644
--- a/compiler/utils/Makefile
+++ b/compiler/utils/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/15]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/20]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -2581,11 +2581,25 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
-ppu$(PPUEXT): ppu.pas
+ifndef NOCPUDEF
+ppu$(PPUEXT): ../ppu.pas
+	$(MAKE) ppu$(PPUEXT) NOCPUDEF=1
+ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)
+	$(MAKE) ppudump$(EXEEXT) NOCPUDEF=1
 ppufiles$(EXEEXT): ppufiles.pp ppu$(PPUEXT)
+	$(MAKE) ppufiles$(EXEEXT) NOCPUDEF=1
+ppumove$(EXEEXT): ppumove.pp ppu$(PPUEXT)
+	$(MAKE) ppumove$(EXEEXT) NOCPUDEF=1
+else
+ppu$(PPUEXT): ../ppu.pas
+	$(COMPILER) ../ppu.pas -Fu../generic -dGENERIC_CPU -Fi..
 ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)
 	$(COMPILER) ppudump.pp -Fu../generic -dGENERIC_CPU -Fi..
+ppufiles$(EXEEXT): ppufiles.pp ppu$(PPUEXT)
+	$(COMPILER) ppufiles.pp -Fu../generic -dGENERIC_CPU -Fi..
 ppumove$(EXEEXT): ppumove.pp ppu$(PPUEXT)
+	$(COMPILER) ppumove.pp -Fu../generic -dGENERIC_CPU -Fi..
+endif
 msg2inc$(EXEEXT): $(COMPILER_UNITTARGETDIR) msg2inc.pp
 fpcsubst$(EXEEXT): fpcsubst.pp usubst.pp
 fpcmkcfg$(EXEEXT): fpcmkcfg.pp usubst.pp fpccfg.inc fpcfg.inc fpini.inc
diff --git a/compiler/utils/Makefile.fpc b/compiler/utils/Makefile.fpc
index 6a5a46fc4f..2ce6eb9146 100644
--- a/compiler/utils/Makefile.fpc
+++ b/compiler/utils/Makefile.fpc
@@ -34,15 +34,33 @@ build=n
 # due to overwriting each other's link.res file
 .NOTPARALLEL:
 
-ppu$(PPUEXT): ppu.pas
+ifndef NOCPUDEF
+ppu$(PPUEXT): ../ppu.pas
+	$(MAKE) ppu$(PPUEXT) NOCPUDEF=1
+
+ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)
+	$(MAKE) ppudump$(EXEEXT) NOCPUDEF=1
 
 ppufiles$(EXEEXT): ppufiles.pp ppu$(PPUEXT)
+	$(MAKE) ppufiles$(EXEEXT) NOCPUDEF=1
 
+ppumove$(EXEEXT): ppumove.pp ppu$(PPUEXT)
+	$(MAKE) ppumove$(EXEEXT) NOCPUDEF=1
+
+else
+ppu$(PPUEXT): ../ppu.pas
+        $(COMPILER) ../ppu.pas -Fu../generic -dGENERIC_CPU -Fi..
 
 ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)
         $(COMPILER) ppudump.pp -Fu../generic -dGENERIC_CPU -Fi..
 
+ppufiles$(EXEEXT): ppufiles.pp ppu$(PPUEXT)
+        $(COMPILER) ppufiles.pp -Fu../generic -dGENERIC_CPU -Fi..
+
 ppumove$(EXEEXT): ppumove.pp ppu$(PPUEXT)
+        $(COMPILER) ppumove.pp -Fu../generic -dGENERIC_CPU -Fi..
+
+endif
 
 msg2inc$(EXEEXT): $(COMPILER_UNITTARGETDIR) msg2inc.pp