diff --git a/tools/install/create_fpc_rpm.sh b/tools/install/create_fpc_rpm.sh
index 059eef8825..cb3f9fa76e 100755
--- a/tools/install/create_fpc_rpm.sh
+++ b/tools/install/create_fpc_rpm.sh
@@ -78,6 +78,10 @@ if [ "$CompilerPatch" != "0" ]; then
 fi
 echo " $CompilerVersionStr-$FPCRelease"
 
+Arch=i386
+if [ -f /etc/rpm/platform ]; then
+  Arch=$(cat /etc/rpm/platform | sed -e 's/-.*//')
+fi
 
 
 #------------------------------------------------------------------------------
@@ -163,7 +167,7 @@ else
   fi
   rpmbuild --nodeps -ba $SpecFile
 
-  echo "The new rpm can be found in $(./rpm/get_rpm_source_dir.sh)/RPMS/i386/fpc-$FPCVersion-$FPCRelease.i386.rpm"
+  echo "The new rpm can be found in $(./rpm/get_rpm_source_dir.sh)/RPMS/$Arch/fpc-$FPCVersion-$FPCRelease.$Arch.rpm"
 fi
 
 # end.
diff --git a/tools/install/create_lazarus_rpm.sh b/tools/install/create_lazarus_rpm.sh
index e2eff9ca72..e6ee1525f9 100755
--- a/tools/install/create_lazarus_rpm.sh
+++ b/tools/install/create_lazarus_rpm.sh
@@ -27,6 +27,11 @@ SrcTGZ=$(./rpm/get_rpm_source_dir.sh)/SOURCES/$Src
 TmpDir=/tmp/lazarus$LazVersion
 SpecFile=rpm/lazarus-$LazVersion-$LazRelease.spec
 
+Arch=i386
+if [ -f /etc/rpm/platform ]; then
+  Arch=$(cat /etc/rpm/platform | sed -e 's/-.*//')
+fi
+
 # download lazarus svn if needed
 echo "creating lazarus tgz ..."
 #if [ ! -f $SrcTGZ ]; then
@@ -48,7 +53,7 @@ cat rpm/lazarus.spec.template | \
 echo "building rpm ..."
 rpm -ba $SpecFile || rpmbuild -ba $SpecFile
 
-echo "The new rpm can be found at $(./rpm/get_rpm_source_dir.sh)/RPMS/i386/lazarus-$LazVersion-$LazRelease.i386.rpm"
+echo "The new rpm can be found at $(./rpm/get_rpm_source_dir.sh)/RPMS/$Arch/lazarus-$LazVersion-$LazRelease.$Arch.rpm"
 
 # end.