diff --git a/system/hntool/README b/system/hntool/README
new file mode 100644
index 0000000000..c951578f06
--- /dev/null
+++ b/system/hntool/README
@@ -0,0 +1,7 @@
+HnTool is an open source (GPLv2) hardening tool for Unix.
+
+It scans your system for vulnerabilities or problems in configuration
+files allowing you to get a quick overview of the security status of
+your system.
+
+This requires the Python setuptools (pysetuptools on SlackBuilds.org).
diff --git a/system/hntool/hntool.SlackBuild b/system/hntool/hntool.SlackBuild
new file mode 100644
index 0000000000..73dad06090
--- /dev/null
+++ b/system/hntool/hntool.SlackBuild
@@ -0,0 +1,73 @@
+#!/bin/sh
+# Slackware build script for <appname>
+# Written by Diogo Leal (diogo@diogoleal.com
+
+PRGNAM=hntool
+VERSION=${VERSION:-0.1.2}	
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}		
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}	
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e 
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -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 {} \;
+
+python setup.py install --root=$PKG
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Move man to right location
+mv $PKG/usr/share/man $PKG/usr/
+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
+
+# Move docs to right location
+mv $PKG/usr/share/doc $PKG/usr/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Remove (now empty) directory
+rm -r $PKG/usr/share
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/hntool/hntool.info b/system/hntool/hntool.info
new file mode 100644
index 0000000000..5a6bf3bc50
--- /dev/null
+++ b/system/hntool/hntool.info
@@ -0,0 +1,10 @@
+PRGNAM="hntool"
+VERSION="0.1.2"
+HOMEPAGE="http://hntool.net/"
+DOWNLOAD="http://hntool.googlecode.com/files/hntool-0.1.2.tar.gz"
+MD5SUM="87e60acb3d3d984f6330eb103c87776b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Diogo Leal"
+EMAIL="diogo@diogoleal.com"
+APPROVED="Niels Horn"
diff --git a/system/hntool/slack-desc b/system/hntool/slack-desc
new file mode 100644
index 0000000000..35df1e918f
--- /dev/null
+++ b/system/hntool/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+      |-----handy-ruler------------------------------------------------------|
+hntool: hntool (an open source (GPLV2) hardening tool for unix.)
+hntool:
+hntool: It scans your system for vulnerabilities or problems in configuration 
+hntool: files allowing you to get a quick overview of the security status 
+hntool: of your system.
+hntool:
+hntool: Homepage: http://hntool.net/
+hntool:
+hntool:
+hntool:
+hntool: