diff --git a/system/makeself/makeself.SlackBuild b/system/makeself/makeself.SlackBuild
index c053ab7511..4c06c83042 100644
--- a/system/makeself/makeself.SlackBuild
+++ b/system/makeself/makeself.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=makeself
-VERSION=2.2.0
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.2.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -48,10 +48,10 @@ fi
 cd $PRGNAM-release-$VERSION
 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
 
 sed -i -e "s,HEADER\=\`dirname \"\$0\"\`,HEADER\=\/usr\/share,g" makeself.sh
 mkdir -p $PKG/usr/bin
@@ -62,13 +62,14 @@ cp makeself.sh $PKG/usr/bin
 cat makeself.1 |gzip -9 > $PKG/usr/man/man1/makeself.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING README.md makeself.lsm update-readme \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md makeself.lsm update-readme $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
+cd $PKG/usr/bin
+ln -s makeself.sh $PRGNAM
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}