diff --git a/games/nevernoid/README b/games/nevernoid/README
index d4d8ffbde4..c1a445fe76 100644
--- a/games/nevernoid/README
+++ b/games/nevernoid/README
@@ -5,11 +5,6 @@ script simply packages the binary in a Slack-friendly way, including
 a wrapper script to allow the game to work without being run from its
 data directory.
 
-Note: the fullscreen option is visible in the options menu, but it's
-non-functional (author disabled it on purpose).
-
-Note: the download site checks the HTTP referrer header, wget won't work
-without some hackery. Easier to just use a browser.
-
-Note to 64-bit users: The game is a 32-bit x86 binary. It should run if
-you have multilib and 32-bit compatibility libraries installed.
+Note: In the 32-bit build, the fullscreen option is visible in the
+options menu, but it's non-functional (author disabled it on purpose). The
+fullscreen option works in the 64-bit build.
diff --git a/games/nevernoid/nevernoid.SlackBuild b/games/nevernoid/nevernoid.SlackBuild
index 31e846f566..d131d0ba55 100644
--- a/games/nevernoid/nevernoid.SlackBuild
+++ b/games/nevernoid/nevernoid.SlackBuild
@@ -7,18 +7,32 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=nevernoid
-ARCHIVE="NeverNoid_v12_linux_x86.tar.gz"
 VERSION=${VERSION:-1.2}
-ARCH=i486  # which might be a lie! (we dunno how it was compiled)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Binary-only package, so no CFLAGS here
+case "$ARCH" in
+  i?86)   PARCH=x86 ; ARCH=i486 ;;
+  x86_64) PARCH=x64 ;;
+  *) echo "Unsupported ARCH '$ARCH'" 1>&2 ; exit 1 ;;
+esac
+
+PVER=${VERSION//./}
+ARCHIVE="NeverNoid_v${PVER}_linux_${PARCH}.tar.gz"
 
 set -e
 
@@ -28,12 +42,14 @@ cd $TMP
 rm -rf $PRGNAM
 tar xvf $CWD/$ARCHIVE
 cd $PRGNAM
+
+# Upstream fixed a bug in one of the maps, as a separate download.
+unzip $CWD/"watch the birdy.zip"
+mv "watch the birdy.map" maps/
+
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find . -type f -print0 | xargs -0 chmod 644
+find . -type d -print0 | xargs -0 chmod 755
 
 mkdir -p $PKG/usr/libexec $PKG/usr/games $PKG/usr/share/$PRGNAM
 install -m0755 -o root -g root $PRGNAM $PKG/usr/libexec
diff --git a/games/nevernoid/nevernoid.info b/games/nevernoid/nevernoid.info
index 8f7d0f75c3..3ddcf1679f 100644
--- a/games/nevernoid/nevernoid.info
+++ b/games/nevernoid/nevernoid.info
@@ -1,10 +1,14 @@
 PRGNAM="nevernoid"
 VERSION="1.2"
 HOMEPAGE="http://www.doubledev.com/nevernoid.html"
-DOWNLOAD="http://www.sourcefiles.org/Games/Arcade/Block_Based/NeverNoid_v12_linux_x86.tar.gz"
-MD5SUM="ce70344326b85c87907bba42e09c3f58"
-DOWNLOAD_x86_64="UNSUPPORTED"
-MD5SUM_x86_64=""
+DOWNLOAD="http://www.doubledev.com/downloads/NeverNoid_v12_linux_x86.tar.gz \
+          http://www.doubledev.com/downloads/watch%20the%20birdy.zip"
+MD5SUM="ce70344326b85c87907bba42e09c3f58 \
+        e943ff6c8a189bc09dfe6963a916eaee"
+DOWNLOAD_x86_64="http://www.doubledev.com/downloads/NeverNoid_v12_linux_x64.tar.gz \
+                 http://www.doubledev.com/downloads/watch%20the%20birdy.zip"
+MD5SUM_x86_64="3a754706e414c3958457b69833a0e778 \
+               e943ff6c8a189bc09dfe6963a916eaee"
 REQUIRES=""
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"