diff --git a/audio/mp3wrap/mp3wrap.SlackBuild b/audio/mp3wrap/mp3wrap.SlackBuild
index cde7afefe2..9ce09f1fa5 100644
--- a/audio/mp3wrap/mp3wrap.SlackBuild
+++ b/audio/mp3wrap/mp3wrap.SlackBuild
@@ -5,13 +5,13 @@
 # Based on a number of SlackBuild scripts found on http://slackbuilds.org
 
 PRGNAM=mp3wrap
-VERSION=0.5
+VERSION=${VERSION:-0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -23,8 +23,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"