diff --git a/games/gargoyle/gargoyle.SlackBuild b/games/gargoyle/gargoyle.SlackBuild
index f536f246af..bfa8194bcd 100644
--- a/games/gargoyle/gargoyle.SlackBuild
+++ b/games/gargoyle/gargoyle.SlackBuild
@@ -9,9 +9,12 @@ VERSION=${VERSION:-2011.1}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
+SRCNAM=garglk
+SRCVER=stable-${VERSION}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,8 +25,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"
@@ -41,10 +44,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-tar xvf $CWD/stable-${VERSION}.tar.gz
-cd garglk-stable-$VERSION
+rm -rf $SRCNAM-$SRCVER
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+cd $SRCNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -52,6 +54,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+env -u BUILD \
 jam -s DESTDIR=$PKG \
  -s _BINDIR=/usr/libexec/gargoyle \
  -s _APPDIR=/usr/libexec/gargoyle \
diff --git a/games/gargoyle/gargoyle.info b/games/gargoyle/gargoyle.info
index 6d421d974c..45d327005f 100644
--- a/games/gargoyle/gargoyle.info
+++ b/games/gargoyle/gargoyle.info
@@ -1,7 +1,7 @@
 PRGNAM="gargoyle"
 VERSION="2011.1"
 HOMEPAGE="http://ccxvii.net/gargoyle/"
-DOWNLOAD="https://github.com/garglk/garglk/archive/stable-2011.1.tar.gz"
+DOWNLOAD="https://github.com/garglk/garglk/archive/stable-2011.1/garglk-stable-2011.1.tar.gz"
 MD5SUM="3587033d27a2a64618302640b1667902"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""