diff --git a/build b/build
index 4911751..309f75d 100755
--- a/build
+++ b/build
@@ -86,6 +86,8 @@ if [ x$1 = "xdebian" ]; then
   here=`pwd`
   deb_destdir=${here}/debian-template/wiringPi
   cd debian-template/wiringPi
+  ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
+  envsubst < control_template > DEBIAN/control
   rm -rf usr
   cd $here/wiringPi
   make install-deb DEB_DESTDIR=${deb_destdir}
@@ -95,7 +97,7 @@ if [ x$1 = "xdebian" ]; then
   make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian-template/wiringPi/usr/lib DEB_DESTDIR=${deb_destdir}
   cd $here/debian-template
   fakeroot dpkg-deb --build wiringPi
-  mv wiringPi.deb  wiringpi-`cat $here/VERSION`-1.deb
+  dpkg-name wiringPi.deb
   exit
 fi
 
diff --git a/debian-template/wiringPi/DEBIAN/control b/debian-template/wiringPi/control_template
similarity index 95%
rename from debian-template/wiringPi/DEBIAN/control
rename to debian-template/wiringPi/control_template
index 2d1ae2c..383b388 100644
--- a/debian-template/wiringPi/DEBIAN/control
+++ b/debian-template/wiringPi/control_template
@@ -2,7 +2,7 @@ Package: wiringpi
 Version: 3.0
 Section: libraries
 Priority: optional
-Architecture: armhf
+Architecture: $ARCH
 Depends: libc6
 Maintainer: Grazer Computer Club - GC2 <wiringpi@gc2.at>
 Uploaders: Grazer Computer Club - GC2 <wiringpi@gc2.at>