diff --git a/tools/install/build_fpc_snaphot_rpm.sh b/tools/install/build_fpc_snaphot_rpm.sh
index aa81d623d8..7bc3ba6742 100755
--- a/tools/install/build_fpc_snaphot_rpm.sh
+++ b/tools/install/build_fpc_snaphot_rpm.sh
@@ -44,6 +44,8 @@ if [ ! -d $FPCSrcDir/.svn ]; then
   exit -1
 fi
 
+RPMDIR=$(rpm/get_rpm_source_dir.sh)
+
 #------------------------------------------------------------------------------
 # patching
 #------------------------------------------------------------------------------
@@ -71,14 +73,14 @@ perl replace_in_files.pl -sR -f '=\d.\d.\d' -r =$CompilerVersionStr -m 'Makefile
 
 # create a source tar.gz
 cd $TmpDir/..
-tar -czf ~/rpmbuild/SOURCES/fpc-2.1.1-$LazRelease.source.tar.gz fpc
+tar -czf $RPMDIR/SOURCES/fpc-2.1.1-$LazRelease.source.tar.gz fpc
 
 # remove the tempdir
 cd -
 rm -rf $TmpDir
 
 SpecFileTemplate=rpm/fpc.spec.template
-SpecFile=~/rpmbuild/SPECS/fpc.spec
+SpecFile=$RPMDIR/SPECS/fpc.spec
 
 # change spec file
 cat $SpecFileTemplate | \
@@ -88,5 +90,5 @@ cat $SpecFileTemplate | \
 #      -e 's/\(%define builddocdir.*\)/%define __strip smart_strip.sh\n\n\1/' \
 #      -e 's/^\%{fpcdir}\/samplecfg .*/%{fpcdir}\/samplecfg %{_libdir}\/fpc\/\\\$version/' \
 
-rpmbuild -ba $SpecFile
+rpmbuild --target $ARCH -ba $SpecFile --nodeps
 
diff --git a/tools/install/create_lazarus_snapshot_rpm.sh b/tools/install/create_lazarus_snapshot_rpm.sh
index a0e02e665c..742662984e 100755
--- a/tools/install/create_lazarus_snapshot_rpm.sh
+++ b/tools/install/create_lazarus_snapshot_rpm.sh
@@ -27,6 +27,10 @@ fi
 
 Date=`date +%Y%m%d`
 # get fpc snapshot rpm
+RPMDIR=$(rpm/get_rpm_source_dir.sh)
+ARCH=`rpm --eval "%{_arch}"`
+LIB=`rpm --eval "%{_lib}"`
+FPCRPM=$RPMDIR/RPMS/$ARCH/fpc-2.1.1-$Date.$ARCH.rpm
 FPCRPM=~/rpmbuild/RPMS/i386/fpc-2.1.1-$Date.i386.rpm
 if [ ! -f $FPCRPM ]; then
   echo ERROR: fpc rpm $FPCRPM not available
@@ -42,11 +46,13 @@ mkdir -p $TmpFPCDir
 cd $TmpFPCDir
 rpm2cpio $FPCRPM | cpio -id 
 FPCVersion=`usr/bin/fpc -iV`
-usr/lib/fpc/$FPCVersion/samplecfg $TmpFPCDir/usr/lib/fpc/$FPCVersion .
+usr/$LIB/fpc/$FPCVersion/samplecfg $TmpFPCDir/usr/$LIB/fpc/$FPCVersion .
 FPCCfg=$TmpFPCDir/fpc.cfg
 export FPCCfg
 FPC=$TmpFPCDir/usr/bin/fpc
 export FPC
+FPCDIR=$TmpFPCDir/usr/$LIB/fpc/$FPCVersion
+export FPCDIR
 cd -
 
 # create a temporary copy of the lazarus sources for packaging
@@ -64,14 +70,14 @@ fi
 
 # create a source tar.gz
 cd $TmpDir/..
-tar -czf ~/rpmbuild/SOURCES/lazarus-$LazVersion-$Date.tar.gz lazarus
+tar -czf $RPMDIR/SOURCES/lazarus-$LazVersion-$Date.tar.gz lazarus
 
 # remove the tempdir
 cd -
 rm -rf $TmpDir
 
 # create spec file
-SpecFile=~/rpmbuild/SPECS/lazarus-$LazVersion-$Date.spec
+SpecFile=$RPMDIR/SPECS/lazarus-$LazVersion-$Date.spec
 cat rpm/lazarus.spec.template | \
   sed -e "s/LAZVERSION/$LazVersion/g" \
       -e "s/LAZRELEASE/$Date/g" \
@@ -80,7 +86,7 @@ cat rpm/lazarus.spec.template | \
 #      -e "s/FPCSRCVERSION/$FPCRPMVersion/" \
 
 # build rpm
-rpmbuild --target i386 -ba $SpecFile
+rpmbuild --target $ARCH -ba $SpecFile --nodeps
 
 rm -rf $TmpFpcDir
 
diff --git a/tools/install/rpm/fpc.spec.template b/tools/install/rpm/fpc.spec.template
index 5bcb3c7eb6..6bb0fb8e68 100644
--- a/tools/install/rpm/fpc.spec.template
+++ b/tools/install/rpm/fpc.spec.template
@@ -68,7 +68,6 @@ rm -rf packages/extra/winunits
 
 if [ -z "$STARTPP" ]; then
   STARTPP=`which %{ppcname}`
-# STARTPP=/usr/local/bin/ppc386
 fi
 NEWPP=`pwd`/compiler/%{ppcname}
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc