diff --git a/system/exomizer/exomizer.SlackBuild b/system/exomizer/exomizer.SlackBuild
index c914cf5580..b07112a8f6 100644
--- a/system/exomizer/exomizer.SlackBuild
+++ b/system/exomizer/exomizer.SlackBuild
@@ -6,8 +6,15 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20180619 bkw:
+# - update for v3.0.0
+# - host tarball on naptime instead of ponce.cc
+# - handle old style or new style zip filename
+# - only install exoraw if it exists (was removed in 3.0.0)
+# - can still build with VERSION=2.0.9 or VERSION=2.0.10, if needed
+
 PRGNAM=exomizer
-VERSION=${VERSION:-2.0.9}
+VERSION=${VERSION:-3.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,7 +53,8 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-unzip $CWD/${PRGNAM}${VERSION//./}.zip -x dos/\* win32/\*
+unzip $CWD/${PRGNAM}${VERSION//./}.zip -x dos/\* win32/\* || \
+  unzip $CWD/$PRGNAM-$VERSION.zip -x dos/\* win32/\*
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -56,7 +64,8 @@ find -L . \
 
 make -C src CFLAGS="$SLKCFLAGS"
 mkdir -p $PKG/usr/bin
-install -s -m0755 src/$PRGNAM src/exobasic src/exoraw $PKG/usr/bin
+install -s -m0755 src/$PRGNAM src/exobasic $PKG/usr/bin
+[ -x src/exoraw ] && install -s -m0755 src/exoraw $PKG/usr/bin
 
 # exodecrs and rawdecrs contain decompressors written in 6502, 6809,
 # and z80 asm. Best place for them is the doc dir.
diff --git a/system/exomizer/exomizer.info b/system/exomizer/exomizer.info
index afc6a318fd..c66a840d34 100644
--- a/system/exomizer/exomizer.info
+++ b/system/exomizer/exomizer.info
@@ -1,8 +1,8 @@
 PRGNAM="exomizer"
-VERSION="2.0.9"
+VERSION="3.0.0"
 HOMEPAGE="https://bitbucket.org/magli143/exomizer/wiki/Home"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/exomizer209.zip"
-MD5SUM="9ad0e5c1883fafc1505ccc7f88d024f7"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/exomizer-3.0.0.zip"
+MD5SUM="94eee44e01a531da8feeaa5de8b5c285"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""