diff --git a/base/mate-backgrounds/mate-backgrounds.SlackBuild b/base/mate-backgrounds/mate-backgrounds.SlackBuild
index b05a287..1bc2aea 100644
--- a/base/mate-backgrounds/mate-backgrounds.SlackBuild
+++ b/base/mate-backgrounds/mate-backgrounds.SlackBuild
@@ -39,8 +39,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/base/mate-common/mate-common.SlackBuild b/base/mate-common/mate-common.SlackBuild
index 95d389c..93b7dfe 100644
--- a/base/mate-common/mate-common.SlackBuild
+++ b/base/mate-common/mate-common.SlackBuild
@@ -30,7 +30,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +45,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/base/mate-themes/mate-themes.SlackBuild b/base/mate-themes/mate-themes.SlackBuild
index 836c2ea..c5e06a3 100644
--- a/base/mate-themes/mate-themes.SlackBuild
+++ b/base/mate-themes/mate-themes.SlackBuild
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/atkmm/atkmm.SlackBuild b/deps/atkmm/atkmm.SlackBuild
index eb02d9b..5cd82aa 100644
--- a/deps/atkmm/atkmm.SlackBuild
+++ b/deps/atkmm/atkmm.SlackBuild
@@ -31,7 +31,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -46,8 +46,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/cairomm/cairomm.SlackBuild b/deps/cairomm/cairomm.SlackBuild
index 08c8fd6..908bead 100644
--- a/deps/cairomm/cairomm.SlackBuild
+++ b/deps/cairomm/cairomm.SlackBuild
@@ -31,7 +31,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -46,8 +46,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/docutils/docutils.SlackBuild b/deps/docutils/docutils.SlackBuild
index 0b0e986..a1c01f1 100755
--- a/deps/docutils/docutils.SlackBuild
+++ b/deps/docutils/docutils.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
diff --git a/deps/gksu/gksu.SlackBuild b/deps/gksu/gksu.SlackBuild
index ed43a36..76fcaaf 100644
--- a/deps/gksu/gksu.SlackBuild
+++ b/deps/gksu/gksu.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/glibmm/glibmm.SlackBuild b/deps/glibmm/glibmm.SlackBuild
index d196b1a..2a3b9db 100644
--- a/deps/glibmm/glibmm.SlackBuild
+++ b/deps/glibmm/glibmm.SlackBuild
@@ -31,7 +31,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -46,8 +46,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/gssdp/gssdp.SlackBuild b/deps/gssdp/gssdp.SlackBuild
index af3dcaf..eaf16f1 100644
--- a/deps/gssdp/gssdp.SlackBuild
+++ b/deps/gssdp/gssdp.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/gtk-engines/gtk-engines.SlackBuild b/deps/gtk-engines/gtk-engines.SlackBuild
index 9939477..89852b5 100644
--- a/deps/gtk-engines/gtk-engines.SlackBuild
+++ b/deps/gtk-engines/gtk-engines.SlackBuild
@@ -30,7 +30,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +45,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/gtkmm/gtkmm.SlackBuild b/deps/gtkmm/gtkmm.SlackBuild
index 7dcc86d..7e32058 100644
--- a/deps/gtkmm/gtkmm.SlackBuild
+++ b/deps/gtkmm/gtkmm.SlackBuild
@@ -32,7 +32,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -47,8 +47,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/gtksourceview/gtksourceview.SlackBuild b/deps/gtksourceview/gtksourceview.SlackBuild
index 1f7228e..3959ddb 100644
--- a/deps/gtksourceview/gtksourceview.SlackBuild
+++ b/deps/gtksourceview/gtksourceview.SlackBuild
@@ -33,7 +33,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -49,8 +49,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/gupnp/gupnp.SlackBuild b/deps/gupnp/gupnp.SlackBuild
index 9fbe42b..0f49e2e 100644
--- a/deps/gupnp/gupnp.SlackBuild
+++ b/deps/gupnp/gupnp.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/libgksu/libgksu.SlackBuild b/deps/libgksu/libgksu.SlackBuild
index 236d64b..ef3f2fd 100644
--- a/deps/libgksu/libgksu.SlackBuild
+++ b/deps/libgksu/libgksu.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/libgnomecanvas/libgnomecanvas.SlackBuild b/deps/libgnomecanvas/libgnomecanvas.SlackBuild
index 707bcdc..6641f48 100644
--- a/deps/libgnomecanvas/libgnomecanvas.SlackBuild
+++ b/deps/libgnomecanvas/libgnomecanvas.SlackBuild
@@ -18,7 +18,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -33,8 +33,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/libgtop/libgtop.SlackBuild b/deps/libgtop/libgtop.SlackBuild
index ac1a83c..a1e66b4 100644
--- a/deps/libgtop/libgtop.SlackBuild
+++ b/deps/libgtop/libgtop.SlackBuild
@@ -30,7 +30,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +45,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/liboobs/liboobs.SlackBuild b/deps/liboobs/liboobs.SlackBuild
index f40a5cc..b98fa7e 100644
--- a/deps/liboobs/liboobs.SlackBuild
+++ b/deps/liboobs/liboobs.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/libsigc++/libsigc++.SlackBuild b/deps/libsigc++/libsigc++.SlackBuild
index c1c64f8..d492811 100644
--- a/deps/libsigc++/libsigc++.SlackBuild
+++ b/deps/libsigc++/libsigc++.SlackBuild
@@ -33,7 +33,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -50,8 +50,8 @@ OUTPUT=${OUTPUT:-/tmp}
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
 
-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"
diff --git a/deps/libunique/libunique.SlackBuild b/deps/libunique/libunique.SlackBuild
index 4374954..85f8412 100644
--- a/deps/libunique/libunique.SlackBuild
+++ b/deps/libunique/libunique.SlackBuild
@@ -30,7 +30,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +45,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/mm-common/mm-common.SlackBuild b/deps/mm-common/mm-common.SlackBuild
index cd2697e..0c7169c 100644
--- a/deps/mm-common/mm-common.SlackBuild
+++ b/deps/mm-common/mm-common.SlackBuild
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/murrine/murrine.SlackBuild b/deps/murrine/murrine.SlackBuild
index bf8afc7..1bef0f1 100644
--- a/deps/murrine/murrine.SlackBuild
+++ b/deps/murrine/murrine.SlackBuild
@@ -30,7 +30,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -46,8 +46,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/pangomm/pangomm.SlackBuild b/deps/pangomm/pangomm.SlackBuild
index 159ccaa..7f70a93 100644
--- a/deps/pangomm/pangomm.SlackBuild
+++ b/deps/pangomm/pangomm.SlackBuild
@@ -31,7 +31,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -46,8 +46,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/pangox-compat/pangox-compat.SlackBuild b/deps/pangox-compat/pangox-compat.SlackBuild
index e5e5bff..29888a9 100755
--- a/deps/pangox-compat/pangox-compat.SlackBuild
+++ b/deps/pangox-compat/pangox-compat.SlackBuild
@@ -30,7 +30,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
        *) export ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +45,8 @@ TMP=${TMP:-/tmp/msb}
 PKG=${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" = "s390" ]; then
   SLKCFLAGS="-O2"
diff --git a/deps/perl-net-dbus/perl-net-dbus.SlackBuild b/deps/perl-net-dbus/perl-net-dbus.SlackBuild
index 3641abd..4044fa4 100755
--- a/deps/perl-net-dbus/perl-net-dbus.SlackBuild
+++ b/deps/perl-net-dbus/perl-net-dbus.SlackBuild
@@ -34,7 +34,7 @@ wget -c http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/$SRCNAM-$VERSION.tar
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +45,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/pygobject3/pygobject3.SlackBuild b/deps/pygobject3/pygobject3.SlackBuild
index fa81698..2355a47 100755
--- a/deps/pygobject3/pygobject3.SlackBuild
+++ b/deps/pygobject3/pygobject3.SlackBuild
@@ -30,7 +30,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +45,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/pygtksourceview/pygtksourceview.SlackBuild b/deps/pygtksourceview/pygtksourceview.SlackBuild
index 8667a09..9a332d5 100755
--- a/deps/pygtksourceview/pygtksourceview.SlackBuild
+++ b/deps/pygtksourceview/pygtksourceview.SlackBuild
@@ -32,7 +32,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -47,8 +47,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/rarian/rarian.SlackBuild b/deps/rarian/rarian.SlackBuild
index a5f446c..e99fb57 100644
--- a/deps/rarian/rarian.SlackBuild
+++ b/deps/rarian/rarian.SlackBuild
@@ -31,7 +31,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -46,8 +46,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/system-tools-backends/system-tools-backends.SlackBuild b/deps/system-tools-backends/system-tools-backends.SlackBuild
index 1be861f..db45a70 100644
--- a/deps/system-tools-backends/system-tools-backends.SlackBuild
+++ b/deps/system-tools-backends/system-tools-backends.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/yelp-tools/yelp-tools.SlackBuild b/deps/yelp-tools/yelp-tools.SlackBuild
index 71b5359..03f9bdd 100644
--- a/deps/yelp-tools/yelp-tools.SlackBuild
+++ b/deps/yelp-tools/yelp-tools.SlackBuild
@@ -30,7 +30,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +45,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/yelp-xsl/yelp-xsl.SlackBuild b/deps/yelp-xsl/yelp-xsl.SlackBuild
index 16347db..014b0e2 100644
--- a/deps/yelp-xsl/yelp-xsl.SlackBuild
+++ b/deps/yelp-xsl/yelp-xsl.SlackBuild
@@ -30,7 +30,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +45,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/deps/zenity/zenity.SlackBuild b/deps/zenity/zenity.SlackBuild
index 1dcd096..844d202 100644
--- a/deps/zenity/zenity.SlackBuild
+++ b/deps/zenity/zenity.SlackBuild
@@ -11,7 +11,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -26,8 +26,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/extra/caja-dropbox/caja-dropbox.SlackBuild b/extra/caja-dropbox/caja-dropbox.SlackBuild
index 8e7bf5a..1353114 100644
--- a/extra/caja-dropbox/caja-dropbox.SlackBuild
+++ b/extra/caja-dropbox/caja-dropbox.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/extra/galculator/galculator.SlackBuild b/extra/galculator/galculator.SlackBuild
index 4cb21cd..3c89e4f 100644
--- a/extra/galculator/galculator.SlackBuild
+++ b/extra/galculator/galculator.SlackBuild
@@ -32,7 +32,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -48,8 +48,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/extra/gnome-main-menu/gnome-main-menu.SlackBuild b/extra/gnome-main-menu/gnome-main-menu.SlackBuild
index 74b866d..b9e008d 100644
--- a/extra/gnome-main-menu/gnome-main-menu.SlackBuild
+++ b/extra/gnome-main-menu/gnome-main-menu.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/extra/mate-icon-theme-faenza/mate-icon-theme-faenza.SlackBuild b/extra/mate-icon-theme-faenza/mate-icon-theme-faenza.SlackBuild
index f67f150..b4ca8fa 100644
--- a/extra/mate-icon-theme-faenza/mate-icon-theme-faenza.SlackBuild
+++ b/extra/mate-icon-theme-faenza/mate-icon-theme-faenza.SlackBuild
@@ -39,8 +39,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/extra/mate-system-tools/mate-system-tools.SlackBuild b/extra/mate-system-tools/mate-system-tools.SlackBuild
index 0d22380..a77e810 100644
--- a/extra/mate-system-tools/mate-system-tools.SlackBuild
+++ b/extra/mate-system-tools/mate-system-tools.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/extra/mozo/mozo.SlackBuild b/extra/mozo/mozo.SlackBuild
index 7f1de44..ef8e7af 100644
--- a/extra/mozo/mozo.SlackBuild
+++ b/extra/mozo/mozo.SlackBuild
@@ -30,7 +30,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -45,8 +45,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/testing/mate-tweak/mate-tweak.SlackBuild b/testing/mate-tweak/mate-tweak.SlackBuild
index ae5cdb5..ee5974d 100644
--- a/testing/mate-tweak/mate-tweak.SlackBuild
+++ b/testing/mate-tweak/mate-tweak.SlackBuild
@@ -31,7 +31,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -46,8 +46,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/testing/numix-icon-theme-circle/numix-icon-theme-circle.SlackBuild b/testing/numix-icon-theme-circle/numix-icon-theme-circle.SlackBuild
index 822c50d..922866f 100644
--- a/testing/numix-icon-theme-circle/numix-icon-theme-circle.SlackBuild
+++ b/testing/numix-icon-theme-circle/numix-icon-theme-circle.SlackBuild
@@ -28,7 +28,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -39,8 +39,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/testing/numix-icon-theme-shine/numix-icon-theme-shine.SlackBuild b/testing/numix-icon-theme-shine/numix-icon-theme-shine.SlackBuild
index 480a824..d48e161 100644
--- a/testing/numix-icon-theme-shine/numix-icon-theme-shine.SlackBuild
+++ b/testing/numix-icon-theme-shine/numix-icon-theme-shine.SlackBuild
@@ -28,7 +28,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -39,8 +39,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/testing/numix-icon-theme/numix-icon-theme.SlackBuild b/testing/numix-icon-theme/numix-icon-theme.SlackBuild
index 69eecc0..789e1c4 100644
--- a/testing/numix-icon-theme/numix-icon-theme.SlackBuild
+++ b/testing/numix-icon-theme/numix-icon-theme.SlackBuild
@@ -28,7 +28,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -39,8 +39,8 @@ TMP=${TMP:-/tmp/msb}
 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"
diff --git a/testing/yelp/yelp.SlackBuild b/testing/yelp/yelp.SlackBuild
index 175e7a3..a9bafd3 100644
--- a/testing/yelp/yelp.SlackBuild
+++ b/testing/yelp/yelp.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_msb}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/msb}
 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"