diff --git a/network/noip2/noip2.SlackBuild b/network/noip2/noip2.SlackBuild
index bd3f68072e..9ea7572479 100644
--- a/network/noip2/noip2.SlackBuild
+++ b/network/noip2/noip2.SlackBuild
@@ -26,13 +26,13 @@
 
 PRGNAM=noip2
 SRCNAM=noip
-VERSION=2.1.9
+VERSION=${VERSION:-2.1.9}
 BUILD=${BUILD:-1}
-TAG=${TAG=_SBo}
+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
@@ -61,8 +61,8 @@ find -L . \
 set -e
 
 # Rewrite CFLAGS
-if [ "$ARCH" = "i486" ]; then
-    sed -i 's#-Wall -g#-O2 -march=i486 -mtune=i686#' Makefile
+if [ "$ARCH" = "i586" ]; then
+    sed -i 's#-Wall -g#-O2 -march=i586 -mtune=i686#' Makefile
 elif [ "$ARCH" = "i686" ]; then
     sed -i 's#-Wall -g#-O2 -march=i686 -mtune=i686#' Makefile
 elif [ "$ARCH" = "x86_64" ]; then