diff --git a/tools/install/build_fpc_snaphot_rpm.sh b/tools/install/build_fpc_snaphot_rpm.sh
index 26265ce45b..e0f345af78 100755
--- a/tools/install/build_fpc_snaphot_rpm.sh
+++ b/tools/install/build_fpc_snaphot_rpm.sh
@@ -44,7 +44,7 @@ fi
 #------------------------------------------------------------------------------
 
 # create a temporary copy of the fpc sources to patch it
-TmpDir=/tmp/fpc
+TmpDir=/tmp/`whoami`/fpc
 rm -rf $TmpDir
 
 echo "extracting FPC from local svn ..."
@@ -65,7 +65,7 @@ fi
 perl replace_in_files.pl -sR -f '=\d.\d.\d' -r =$CompilerVersionStr -m 'Makefile(.fpc)?' $TmpDir/*
 
 # create a source tar.gz
-cd /tmp
+cd $TmpDir
 tar -czf ~/rpmbuild/SOURCES/fpc-2.1.1-$LazRelease.source.tar.gz fpc
 
 # remove the tempdir
diff --git a/tools/install/create_lazarus_snapshot_rpm.sh b/tools/install/create_lazarus_snapshot_rpm.sh
index d041a74800..d044cc4b01 100755
--- a/tools/install/create_lazarus_snapshot_rpm.sh
+++ b/tools/install/create_lazarus_snapshot_rpm.sh
@@ -35,7 +35,8 @@ if [ ! -f $FPCRPM ]; then
   exit
 fi
 
-TmpFPCDir=~/tmp/fpc
+User=`whoami`
+TmpFPCDir=/tmp/$User/fpc
 if [ -e $TmpFPCDir ]; then
   rm -rf $TmpFPCDir
 fi 
@@ -61,7 +62,7 @@ svn export $LazSrcDir $TmpDir
 
 # create a source tar.gz
 cd $TmpDir/..
-tar -czf ~/rpmbuild/SOURCES/lazarus-$LazVersion-$Date.source.tar.gz lazarus
+tar -czf ~/rpmbuild/SOURCES/lazarus-$LazVersion-$Date.tar.gz lazarus
 
 # remove the tempdir
 cd -
diff --git a/tools/install/rpm/fpc.spec.template b/tools/install/rpm/fpc.spec.template
index 5bed2fc028..03f7d11c03 100644
--- a/tools/install/rpm/fpc.spec.template
+++ b/tools/install/rpm/fpc.spec.template
@@ -66,7 +66,8 @@ cp -a packages fpcsrc
 rm -rf packages/extra/amunits
 rm -rf packages/extra/winunits
 
-STARTPP=`which %{ppcname}`
+# STARTPP=`which %{ppcname}`
+STARTPP=/usr/local/bin/ppc386
 NEWPP=`pwd`/compiler/%{ppcname}
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
 DATA2INC=`pwd`/utils/data2inc
diff --git a/tools/install/rpm/lazarus.spec.template b/tools/install/rpm/lazarus.spec.template
index b7cf557c46..e69ace64d5 100644
--- a/tools/install/rpm/lazarus.spec.template
+++ b/tools/install/rpm/lazarus.spec.template
@@ -24,7 +24,11 @@ component library - LCL, which is also included in this package.
 
 %build
 cd lazarus
-make OPT="-Fl/opt/gnome/lib"
+MAKEOPTS="-Fl/opt/gnome/lib"
+if [ -n "$FPCCfg" ]; then
+  MAKEOPTS="$MAKEOPTS -n @$FPCCfg"
+fi
+make OPT="$MAKEOPTS"
 strip lazarus
 strip startlazarus