diff --git a/system/bin2iso/bin2iso.SlackBuild b/system/bin2iso/bin2iso.SlackBuild
index 51c13bbd10..91ef15daf5 100644
--- a/system/bin2iso/bin2iso.SlackBuild
+++ b/system/bin2iso/bin2iso.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for bin2iso
 
-# Copyright 2016 Hunter Sezen California, USA
+# Copyright 2016, 2019 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=bin2iso
 VERSION=${VERSION:-19b}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -63,12 +63,16 @@ rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 
-[ -z "$CC" ] && CC=cc
-$CC $SLKCFLAGS -Wall -o $PRGNAM $CWD/$PRGNAM${VERSION}_linux.c
-install -Dm0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+${CC:-cc} \
+  $(printf %s "$SLKCFLAGS") -Wall -o $PRGNAM \
+  $CWD/$PRGNAM${VERSION}_linux.c
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mkdir -p -- "$PKG/usr/bin"
+cp -- $PRGNAM "$PKG/usr/bin/"
+chmod 0755 -- "$PKG/usr/bin/$PRGNAM"
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
+  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp $CWD/readme.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/bin2iso/bin2iso.info b/system/bin2iso/bin2iso.info
index 9b01a3aab8..a6adee948f 100644
--- a/system/bin2iso/bin2iso.info
+++ b/system/bin2iso/bin2iso.info
@@ -1,7 +1,7 @@
 PRGNAM="bin2iso"
 VERSION="19b"
 HOMEPAGE="http://users.eastlink.ca/~doiron/bin2iso/"
-DOWNLOAD="http://users.eastlink.ca/~doiron/bin2iso/linux/bin2iso19b_linux.c"
+DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/system/bin2iso/bin2iso19b_linux.c"
 MD5SUM="01dab72496175a772bcf6e08c854d440"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""