diff --git a/UNUSED/l/gail/SlackBuild b/UNUSED/l/gail/SlackBuild
index 5149ef85..65a2d705 100755
--- a/UNUSED/l/gail/SlackBuild
+++ b/UNUSED/l/gail/SlackBuild
@@ -36,9 +36,9 @@ find . \
   -o -perm 400 \) -exec chmod 644 {} \;
 
 ./configure \
-	--prefix=/usr \
-	--mandir=/usr/man \
-	--libdir=/usr/lib$(echo $ARCH | grep -o 64)
+        --prefix=/usr \
+        --mandir=/usr/man \
+        --libdir=/usr/lib$(echo $ARCH | grep -o 64)
 
 CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
 make install DESTDIR=$PKG
@@ -52,7 +52,7 @@ make install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/SlackBuild
 
 mkdir -p $PKG/install
 cat <<EOF > $PKG/install/slack-desc
@@ -65,16 +65,16 @@ cat <<EOF > $PKG/install/slack-desc
 
     |-----handy-ruler--------------------------------------------------------|
 $PRGNAM: $PRGNAM ()
-$PRGNAM: 
+$PRGNAM:
 $PRGNAM: GAIL provides accessibility support for gtk+ and libgnomecanvas by
 $PRGNAM: implementing AtkObjects for widgets in gtk+ and libgnomecanvas. The
 $PRGNAM: GAIL library is a GTK+ module.
-$PRGNAM: 
 $PRGNAM:
-$PRGNAM: 
-$PRGNAM: 
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
 $PRGNAM: http://ftp.acc.umu.se/pub/gnome/sources/gail/
-$PRGNAM: 
+$PRGNAM:
 EOF
 
 cd $PKG
diff --git a/UNUSED/l/stfl/SlackBuild b/UNUSED/l/stfl/SlackBuild
index 11c2b6d9..56cd32eb 100755
--- a/UNUSED/l/stfl/SlackBuild
+++ b/UNUSED/l/stfl/SlackBuild
@@ -50,7 +50,7 @@ make prefix=/usr mandir=/usr/man DESTDIR=$PKG libdir=/lib$(echo $ARCH | grep -o
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/SlackBuild
 
 mkdir -p $PKG/install
 cat <<EOF > $PKG/install/slack-desc
@@ -63,16 +63,16 @@ cat <<EOF > $PKG/install/slack-desc
 
     |-----handy-ruler--------------------------------------------------------|
 stfl: STFL (the Structured Terminal Forms Language/Library)
-stfl: 
+stfl:
 stfl: STFL is a library which implements a curses-based widget set for text
 stfl: terminals. The STFL API can be used from C, SPL, Python, Perl and
 stfl: Ruby. The public STFL API is only 14 simple function calls big and and
 stfl: there are already generic SWIG bindings. Thus it is very easy to port
 stfl: to additional scripting languages.
-stfl: 
+stfl:
 stfl: Homepage: http://www.clifford.at/stfl/
-stfl: 
-stfl: 
+stfl:
+stfl:
 EOF
 
 cd $PKG
diff --git a/UNUSED/n/newsbeuter/SlackBuild b/UNUSED/n/newsbeuter/SlackBuild
index dd7450b4..e496ff9c 100755
--- a/UNUSED/n/newsbeuter/SlackBuild
+++ b/UNUSED/n/newsbeuter/SlackBuild
@@ -57,7 +57,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object"| grep ELF | \
 )
 
 cp -a [ACLRT]* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/SlackBuild
 
 mkdir -p $PKG/install
 cat <<EOF > $PKG/install/slack-desc
@@ -69,17 +69,17 @@ cat <<EOF > $PKG/install/slack-desc
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-newsbeuter: Newsbeuter (RSS feedreader) 
-newsbeuter: 
+newsbeuter: Newsbeuter (RSS feedreader)
+newsbeuter:
 newsbeuter: Newsbeuter is an RSS feedreader. RSS is a number of widely-used
 newsbeuter: XML formats to transmit, publish and syndicate articles, for
 newsbeuter: example news or blog articles. Newsbeuter is designed to be used
 newsbeuter: on text terminals on Unix or Unix-like systems such as Linux,
 newsbeuter: BSD or Mac OS X.
-newsbeuter: 
+newsbeuter:
 newsbeuter: Homepage: http://www.newsbeuter.org/
-newsbeuter: 
-newsbeuter: 
+newsbeuter:
+newsbeuter:
 EOF
 
 cd $PKG
diff --git a/UNUSED/n/varnish/SlackBuild b/UNUSED/n/varnish/SlackBuild
index ae5191c9..c2268857 100755
--- a/UNUSED/n/varnish/SlackBuild
+++ b/UNUSED/n/varnish/SlackBuild
@@ -47,7 +47,7 @@ fi
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT 
+mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
@@ -86,7 +86,7 @@ cat $CWD/rc.varnishd > $PKG/etc/rc.d/rc.varnishd.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog INSTALL LICENSE README doc/*.{xml,xsl,html,css} $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/SlackBuild
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
@@ -130,16 +130,16 @@ cat <<EOF > $PKG/install/slack-desc
 
        |-----handy-ruler------------------------------------------------------|
 varnish: VARNISH (high-performance HTTP accelerator)
-varnish: 
+varnish:
 varnish: Varnish is targeted primarily at the FreeBSD 6 and
 varnish: Linux 2.6 platforms, and will take full advantage
 varnish: of the virtual memory system and advanced I/O
 varnish: features offered by these operating systems.
-varnish:   
+varnish:
 varnish: Homepage: http://varnish.projects.linpro.no/
-varnish:  
-varnish: 
-varnish: 
+varnish:
+varnish:
+varnish:
 
 EOF
 
diff --git a/UNUSED/n/w3m/SlackBuild b/UNUSED/n/w3m/SlackBuild
index a234f8aa..15e48477 100755
--- a/UNUSED/n/w3m/SlackBuild
+++ b/UNUSED/n/w3m/SlackBuild
@@ -61,7 +61,7 @@ make DESTDIR=$PKG install
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a [ACNT]* doc/* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/SlackBuild
 find $PKG/usr/man/ -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/install
@@ -75,7 +75,7 @@ cat <<EOF > $PKG/install/slack-desc
 
    |-----handy-ruler--------------------------------------------------------|
 w3m: w3m (text-mode browser)
-w3m: 
+w3m:
 w3m: w3m is a World Wide Web (WWW) text based client. It has English and
 w3m: Japanese help files and an option menu and can be configured to use
 w3m: either language. It will display hypertext markup language (HTML)
@@ -83,7 +83,7 @@ w3m: documents containing links to files residing on the local system, as
 w3m: well as files residing on remote systems. It can display HTML tables,
 w3m: frames, and images, and supports tabbed browsing. In addition, it can
 w3m: be used as a "pager" in much the same manner as "more" or "less".
-w3m: 
+w3m:
 w3m: Homepage: http://w3m.sourceforge.net/
 EOF
 
diff --git a/UNUSED/xap/comix/SlackBuild b/UNUSED/xap/comix/SlackBuild
index aa2855b1..1fa6be76 100755
--- a/UNUSED/xap/comix/SlackBuild
+++ b/UNUSED/xap/comix/SlackBuild
@@ -30,7 +30,7 @@ mv $PKG/usr/share/man $PKG/usr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/SlackBuild
 
 mkdir -p $PKG/install
 cat <<EOF > $PKG/install/slack-desc
@@ -43,16 +43,16 @@ cat <<EOF > $PKG/install/slack-desc
 
      |-----handy-ruler------------------------------------------------------|
 comix: Comix (GTK Comic Book Viewer)
-comix: 
+comix:
 comix: Comix is a user-friendly, customizable image viewer. It is
 comix: specifically designed to handle comic books, but also serves as a
 comix: generic viewer. It reads images in ZIP, RAR or tar archives (also
-comix: gzip or bzip2 compressed) as well as plain image files. It is 
-comix: written in Python and uses GTK+ through the PyGTK bindings. 
-comix: 
+comix: gzip or bzip2 compressed) as well as plain image files. It is
+comix: written in Python and uses GTK+ through the PyGTK bindings.
+comix:
 comix: Homepage: http://comix.sourceforge.net
-comix: 
-comix: 
+comix:
+comix:
 EOF
 
 cd $PKG
diff --git a/ap/antigen/SlackBuild b/ap/antigen/SlackBuild
index b398c8fd..086e2e22 100755
--- a/ap/antigen/SlackBuild
+++ b/ap/antigen/SlackBuild
@@ -33,7 +33,7 @@ cp $REPOSITORY/antigen.zsh $PKG$PREFIX/share/antigen/
 
 mkdir -p $PKG$PREFIX/doc/$PRGNAM
 cp -R $REPOSITORY/*.{txt,mkd} $PKG$PREFIX/doc/$PRGNAM/
-cp $CWD/*.SlackBuild $PKG$PREFIX/doc/$PRGNAM/
+cp $CWD/SlackBuild $PKG$PREFIX/doc/$PRGNAM/
 
 # correction
 cd $PKG
diff --git a/d/lua/SlackBuild b/d/lua/SlackBuild
index c5371856..9ce03a74 100755
--- a/d/lua/SlackBuild
+++ b/d/lua/SlackBuild
@@ -103,11 +103,11 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{extras,html}
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
 cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a doc/*.html doc/logo.gif doc/lua.css $PKG/usr/doc/$PRGNAM-$VERSION/html
 
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/SlackBuild
 
 mkdir -p $PKG/install
 cat <<EOF > $PKG/install/slack-desc
diff --git a/l/prettytable/SlackBuild b/l/prettytable/SlackBuild
index 2ef84250..6bb74d6a 100755
--- a/l/prettytable/SlackBuild
+++ b/l/prettytable/SlackBuild
@@ -29,10 +29,10 @@ TAG=${TAG:-cyco} # the "_SBo" is required
 
 if [ -z "$ARCH" ]; then
     case "$( uname -m )" in
-	i?86) ARCH=i486 ;;
-	arm*) ARCH=arm ;;
-	# Unless $ARCH is already set, use uname -m for all other archs:
-	*) ARCH=$( uname -m ) ;;
+        i?86) ARCH=i486 ;;
+        arm*) ARCH=arm ;;
+        # Unless $ARCH is already set, use uname -m for all other archs:
+        *) ARCH=$( uname -m ) ;;
     esac
 fi
 
@@ -55,14 +55,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 
-[ ! -e $CWD/$PRGNAM-$VERSION.tar.bz2 ] && wget -c https://pypi.python.org/packages/source/P/PrettyTable/$PRGNAM-$VERSION.tar.bz2 -O $CWD/$PRGNAM-$VERSION.tar.bz2 
+[ ! -e $CWD/$PRGNAM-$VERSION.tar.bz2 ] && wget -c https://pypi.python.org/packages/source/P/PrettyTable/$PRGNAM-$VERSION.tar.bz2 -O $CWD/$PRGNAM-$VERSION.tar.bz2
 
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
@@ -78,7 +78,7 @@ python setup.py install --root=$PKG
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README CHANGELOG COPYING \
    $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/SlackBuild
 
 # Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
 mkdir -p $PKG/install
diff --git a/xap/google-musicmanager/SlackBuild b/xap/google-musicmanager/SlackBuild
index 60675e7e..0079ead3 100755
--- a/xap/google-musicmanager/SlackBuild
+++ b/xap/google-musicmanager/SlackBuild
@@ -75,7 +75,7 @@ ln -s /opt/google/musicmanager/google-musicmanager.desktop \
   $PKG/usr/share/applications/google-musicmanager.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/SlackBuild
 
 mkdir -p $PKG/install
 cat <<EOF > $PKG/install/slack-desc