diff --git a/graphics/grafx2/grafx2.SlackBuild b/graphics/grafx2/grafx2.SlackBuild
index 1087d977a2..e6f3fd1e63 100644
--- a/graphics/grafx2/grafx2.SlackBuild
+++ b/graphics/grafx2/grafx2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for GrafX2
 
-# Copyright 2015 Jorge Giner Cordero
+# Copyright 2015-2016 Jorge Giner Cordero
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,7 @@ 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
@@ -40,8 +40,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"
diff --git a/graphics/grafx2/grafx2.info b/graphics/grafx2/grafx2.info
index a1fb8e9140..11f7b90432 100644
--- a/graphics/grafx2/grafx2.info
+++ b/graphics/grafx2/grafx2.info
@@ -1,7 +1,7 @@
 PRGNAM="grafx2"
 VERSION="2.4.2035"
 HOMEPAGE="http://pulkomandy.tk/projects/GrafX2"
-DOWNLOAD="https://grafx2.googlecode.com/files/grafx2-2.4.2035-src.tgz"
+DOWNLOAD="http://pulkomandy.tk/projects/GrafX2/downloads/21"
 MD5SUM="9bfbb3cdbfe35cc195df17c0a8e8b9b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""