diff --git a/cesetup/deb.sh b/cesetup/deb.sh
index d57146e2..396a5c2d 100644
--- a/cesetup/deb.sh
+++ b/cesetup/deb.sh
@@ -4,8 +4,8 @@ min1=${ver//_}
 min=${min1:1}
 dte=$(LC_TIME='en_EN.UTF-8' date -u +"%a %b %d %Y")
 
-arch=""
-if [ $CPU = "x86_64" ]; then
+arch=`uname -m`
+if [ $arch = "x86_64" ]; then
     arch="amd64"
 else
     arch="i386"
diff --git a/cesetup/rpm.sh b/cesetup/rpm.sh
index 3aaa84a6..93c97aa6 100644
--- a/cesetup/rpm.sh
+++ b/cesetup/rpm.sh
@@ -3,9 +3,10 @@ maj=${ver:0:1}
 min1=${ver//_}
 min=${min1:1}
 dte=$(LC_TIME='en_EN.UTF-8' date -u +"%a %b %d %Y")
-specname=coedit-$CPU.spec
+arch=`uname -m`
+specname=coedit-$arch.spec
 
-buildroot=$HOME/rpmbuild/BUILDROOT/coedit-$maj-$min.$CPU
+buildroot=$HOME/rpmbuild/BUILDROOT/coedit-$maj-$min.$arch
 bindir=$buildroot/usr/bin
 pixdir=$buildroot/usr/share/pixmaps
 shcdir=$buildroot/usr/share/applications