diff --git a/system/gpart/gpart.SlackBuild b/system/gpart/gpart.SlackBuild
index 14b7cd3953..e544ccea0b 100644
--- a/system/gpart/gpart.SlackBuild
+++ b/system/gpart/gpart.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gpart
 
-# Copyright 2015 Hunter Sezen California, USA
+# Copyright 2015-2016 Hunter Sezen California, USA
 # 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/system/gpart/gpart.info b/system/gpart/gpart.info
index 4b7e39858d..4143a4e5f4 100644
--- a/system/gpart/gpart.info
+++ b/system/gpart/gpart.info
@@ -1,7 +1,7 @@
 PRGNAM="gpart"
 VERSION="0.3"
 HOMEPAGE="https://github.com/baruch/gpart"
-DOWNLOAD="https://github.com/baruch/gpart/archive/0.3.tar.gz"
+DOWNLOAD="https://github.com/baruch/gpart/archive/0.3/gpart-0.3.tar.gz"
 MD5SUM="2d709068b5123198b3eb337f9d4686a8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""