diff --git a/system/spambayes/README b/network/spambayes/README
similarity index 100%
rename from system/spambayes/README
rename to network/spambayes/README
diff --git a/system/spambayes/slack-desc b/network/spambayes/slack-desc
similarity index 100%
rename from system/spambayes/slack-desc
rename to network/spambayes/slack-desc
diff --git a/system/spambayes/spambayes.SlackBuild b/network/spambayes/spambayes.SlackBuild
similarity index 68%
rename from system/spambayes/spambayes.SlackBuild
rename to network/spambayes/spambayes.SlackBuild
index 46bfa318ee..6bc66d1028 100644
--- a/system/spambayes/spambayes.SlackBuild
+++ b/network/spambayes/spambayes.SlackBuild
@@ -8,12 +8,10 @@ VERSION=${VERSION:-1.0.4}
 BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 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 ) ;;
   esac
 fi
@@ -32,19 +30,16 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+rw,go+r-w,a-s .
+chmod -R u+rw,go+r-w,a-sx+X .
 
-# Eliminate deprecation warning for sets module with Python 2.6
+# Suppress sets module deprecation warning in Python 2.6+.
 sed -i 's/from sets import Set/Set = set/' \
-  spambayes/{classifier.py,TestDriver.py,tokenizer.py,ProxyUI.py}
+  spambayes/{classifier,TestDriver,tokenizer,ProxyUI}.py
 
 python setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CHANGELOG.txt LICENSE.txt NEWTRICKS.txt POP3PROXY.txt \
-  README-DEVEL.txt README.txt TESTING.txt WHAT_IS_NEW.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a contrib $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/spambayes/spambayes.info b/network/spambayes/spambayes.info
similarity index 89%
rename from system/spambayes/spambayes.info
rename to network/spambayes/spambayes.info
index 53596aa208..2ea6c31a92 100644
--- a/system/spambayes/spambayes.info
+++ b/network/spambayes/spambayes.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/spambayes/spambayes-1.0.4.tar.gz"
 MD5SUM="78c33e79888d410711ff3c7dd7e98d79"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Audrius Kazukauskas"
+MAINTAINER="Audrius Kažukauskas"
 EMAIL="audrius@neutrino.lt"
 APPROVED="dsomero"