diff --git a/config.sh b/config.sh
index 593135a1eff..18ed052d975 100755
--- a/config.sh
+++ b/config.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-. arm-toolchain.sh
+. toolchain.sh
 
 make ${arch} ${compiler} ${jobs} mx51_efikamx_defconfig
diff --git a/make-deb.sh b/make-deb.sh
index c27d70cffc1..971fa384433 100755
--- a/make-deb.sh
+++ b/make-deb.sh
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/bash -ex
 
-. arm-toolchain.sh
+. toolchain.sh
 
 target=$1
 
@@ -13,5 +13,5 @@ if [ ! -e .config ]; then
 	./config.sh
 fi
 
-make-kpkg --uc --us --initrd --cross-compile ${toolchain} --subarch efikamx --jobs=${numjobs} --rootcmd=fakeroot --arch armel --revision ${packagedate} ${target}
+V=1 CROSS_SUFFIX="${version}" fakeroot make-kpkg --uc --us --initrd --cross-compile ${toolchain} --subarch efikamx --jobs=${numjobs} --rootcmd=fakeroot --arch armel --revision ${packagedate} ${target}
 
diff --git a/arm-toolchain.sh b/toolchain.sh
similarity index 87%
rename from arm-toolchain.sh
rename to toolchain.sh
index af54b1afcf1..c935cd5b46c 100755
--- a/arm-toolchain.sh
+++ b/toolchain.sh
@@ -3,5 +3,6 @@ archname="arm"
 arch="ARCH=${archname}"
 toolchain="arm-linux-gnueabi-"
 compiler="CROSS_COMPILE=${toolchain}"
+compilerversion="4.4"
 numjobs="16"
 jobs="-j${numjobs}"