diff --git a/abuild b/abuild
index 6350b27819b6d24a791a83c9c05c1162c2e309fc..db77da9342d43e1f0bbc264152cec1292e594904 100755
--- a/abuild
+++ b/abuild
@@ -193,7 +193,7 @@ cleanpkg() {
 	local i
 	msg "Cleaning built packages..."
 	for i in $pkgname $subpackages; do
-		local p="$i-$pkgver-$pkgrel"
+		local p="$i-$pkgver-r$pkgrel"
 		rm -f "$PKGDEST/$p.apk" "$PKGDEST/$p.src.tar.gz"
 	done
 }
diff --git a/abuild.conf b/abuild.conf
index aba818abb98f693c5c5652349977de00e3bd4092..a14649f9d3f5a642fa21a9ccae2e72477f55c218 100644
--- a/abuild.conf
+++ b/abuild.conf
@@ -1,5 +1,7 @@
-export CFLAGS="-march=i486 -Os -fPIC -fstack-protector -fomit-frame-pointer"
+export CHOST=i486-alpine-linux-uclibc
+export CFLAGS="-march=i486 -Os -fPIC -fomit-frame-pointer"
 export CXXFLAGS="$CFLAGS"
+export CPPFLAGS="$CFLAGS"
 
 export PATH=:/usr/i386-gentoo-linux-uclibc/binutils-bin/2.18:$PATH