diff --git a/Makefile b/Makefile
index 899d264..25f7569 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ LDFLAGS+=-L./lib/wxsqlite3-1.9.9/lib/ -lwxcode_gtk2u_wxsqlite3-2.8
 LDFLAGS+=-L./lib/freechart/lib -lwxcode_gtk2u_freechart-2.8
 endif
 
-CXX=$(PREFIX)g++
+CXX=$(HOST)g++
 
 SOURCES=$(shell find src -name '*.cpp' -type f | tr '\n' ' ')
 HEADERS=$(shell find src -name '*.h' -type f)
diff --git a/tools/package.sh b/tools/package.sh
index b66dde8..cfc153d 100755
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%d.%m.%Y`
-[ -z "$ARCH" ] && ARCH=`${PREFIX}gcc -dumpmachine | cut -d- -f1`
+[ -z "$ARCH" ] && ARCH=`${HOST}gcc -dumpmachine | cut -d- -f1`
 VERSION=`cat src/controller/KissCount.h | grep APP_VERSION | cut -d\" -f2`
 DIR="KissCount_build_${VERSION}_${DATE}_${ARCH}"
 FILE="$DIR.tar.bz2"
@@ -21,7 +21,7 @@ make || (echo "Compilation failed" ; exit 1)
 mkdir -p "$DIR"/lib
 cp -r lib/freechart/lib/*.so* lib/wxsqlite3-1.9.9/lib/*.so* "$DIR"/lib
 cp -r kc ressources TODO CONTRIBUTORS COPYING README* www "$DIR"
-find "$DIR" -type f -executable -exec ${PREFIX}strip \{\} \;
+find "$DIR" -type f -executable -exec ${HOST}strip \{\} \;
 tar -jcf "$FILE" "$DIR"
 rm -rf "$DIR"
 
@@ -32,7 +32,7 @@ rm -rf "$DEB_DIR" "$DEB_FILE"
 mkdir -p "$DEB_DIR/lib"
 cp -r lib/freechart/lib/*.so* lib/wxsqlite3-1.9.9/lib/*.so* "$DEB_DIR/lib"
 cp -r kc.1 kc debian README* ChangeLog TODO CONTRIBUTORS ressources "$DEB_DIR"
-${PREFIX}strip "$DEB_DIR/lib/*" kc
+${HOST}strip "$DEB_DIR/lib/*" kc
 #tar -zcf "$DEB_FILE" "$DEB_DIR"
 cd "$DEB_DIR"
 mv debian/Makefile .