diff --git a/config/deb/control b/config/deb/control
index 4283ef2e..e5c7b578 100644
--- a/config/deb/control
+++ b/config/deb/control
@@ -10,7 +10,7 @@ Vcs-Browser: https://github.com/percona/percona-toolkit
 Vcs-Git: git://github.com/percona/percona-toolkit.git
 
 Package: percona-toolkit
-Architecture: amd64
+Architecture: @@ARHITECTURE@@
 Depends: ${perl:Depends}, libdbi-perl (>= 1.13), libdbd-mysql-perl | libdbd-mysql-5.1-perl, libterm-readkey-perl (>=2.10),
     libio-socket-ssl-perl
 Description: Advanced MySQL and system command-line tools
diff --git a/config/rpm/percona-toolkit.spec b/config/rpm/percona-toolkit.spec
index 217cfb70..a0f6d118 100644
--- a/config/rpm/percona-toolkit.spec
+++ b/config/rpm/percona-toolkit.spec
@@ -8,7 +8,7 @@ Vendor:    Percona
 URL:       http://www.percona.com/software/percona-toolkit/
 Source:    percona-toolkit-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch: x86_64
+BuildArch: @@ARHITECTURE@@
 Requires:  perl(DBI) >= 1.13, perl(DBD::mysql) >= 1.0, perl(Time::HiRes), perl(IO::Socket::SSL), perl(Digest::MD5), perl(Term::ReadKey)
 AutoReq:   no
 
diff --git a/util/build-packages b/util/build-packages
index b2b6e39a..89f68ec3 100755
--- a/util/build-packages
+++ b/util/build-packages
@@ -486,7 +486,7 @@ elif [ $OS_ARCH == "linux-386" ]; then
    DEB_ARCH="i386"
 else
    ARCH="noarch"
-   ARCH="all"
+   DEB_ARCH="all"
 fi
 
 sed -i'.bak' -e "s/@@ARHITECTURE@@/$ARCH/" $RPM_CONFIG_DIR/percona-toolkit.spec