diff --git a/games/f1spirit/f1spirit.SlackBuild b/games/f1spirit/f1spirit.SlackBuild
index b5f6bf7df4..8109ea68a7 100644
--- a/games/f1spirit/f1spirit.SlackBuild
+++ b/games/f1spirit/f1spirit.SlackBuild
@@ -2,10 +2,10 @@
 
 # Slackware build script for f1spirit
 
-# Written by Zbigniew Baniewski, Zbigniew.Baniewski@gmail.com
+# Written by Zbigniew Baniewski, <Zbigniew [dot] Baniewski [at] gmail [dot] com>
 
 PRGNAM=f1spirit
-VERSION=0.rc9.1615
+VERSION=${VERSION:-0.rc9.1615}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,19 +43,19 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf ${PRGNAM}-$VERSION __MACOSX
 unzip $CWD/${PRGNAM}-${VERSION}.zip
-cat $CWD/01-no-curl-types.patch | patch -p0 || exit
-cat $CWD/02-Makefile.patch | patch -p0 || exit
+cat $CWD/01-no-curl-types.patch | patch -p0
+cat $CWD/02-Makefile.patch | patch -p0
 cd ${PRGNAM}-${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 {} \;
 
 make install PREFIX=$PKG/usr
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
diff --git a/games/f1spirit/f1spirit.info b/games/f1spirit/f1spirit.info
index 952c300419..0eb11c6304 100644
--- a/games/f1spirit/f1spirit.info
+++ b/games/f1spirit/f1spirit.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Zbigniew Baniewski"
-EMAIL="Zbigniew.Baniewski@gmail.com"
+EMAIL="Zbigniew [dot] Baniewski [at] gmail [dot] com"