diff --git a/system/apg/README b/system/apg/README
new file mode 100644
index 0000000000..ca3dc56b4d
--- /dev/null
+++ b/system/apg/README
@@ -0,0 +1,16 @@
+APG (Automated Password Generator) is a tool set for random password
+generation.
+
+  * For installation instructions see INSTALL
+  * For usage instructions see manpages
+  * For tips see doc/APG_TIPS
+  * For copying information see COPYING
+
+To build the apg daemon as well, start the script with:
+
+  APGD=yes ./apg.SlackBuild
+
+NOTE:
+This release (APG v2.2.0) is NOT compatible with TkAPG (Tcl/Tk frontend
+for APG).
+
diff --git a/system/apg/apg.SlackBuild b/system/apg/apg.SlackBuild
new file mode 100644
index 0000000000..db22bb7a01
--- /dev/null
+++ b/system/apg/apg.SlackBuild
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# Slackware build script for <apg>
+
+# Written by georgy shepelev (geo.shepelev@gmail.com)
+
+PRGNAM=apg
+VERSION=${VERSION:-2.2.3}
+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 user wants to send generated passwords over network
+APGD=${APGD:-no}
+
+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.?z*
+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 {} \;
+
+# edit compilation flags
+sed -i -e "s,FLAGS\ =\ -Wall,FLAGS\ =\ -Wall\ $SLKCFLAGS,g" Makefile
+
+if [ "$APGD" = "yes" ]; then
+	sed -i -e 's,#CS_LIBS\ =\ -lnsl$,CS_LIBS\ =\ -lnsl,g' Makefile
+fi
+
+make apg
+make apgbfm
+if [ "$APGD" = "yes" ]; then
+	make apgd
+fi
+make install INSTALL_PREFIX=$PKG/usr
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+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
+for doc_file in README.CYGWIN THANKS INSTALL TODO COPYING \
+					INSTALL.CYGWIN CHANGES README
+do
+	if [ -f $doc_file ]; then
+		cp -a \
+			$doc_file \
+			$PKG/usr/doc/$PRGNAM-$VERSION
+	fi
+done
+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
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/apg/apg.info b/system/apg/apg.info
new file mode 100644
index 0000000000..b2dec911ae
--- /dev/null
+++ b/system/apg/apg.info
@@ -0,0 +1,10 @@
+PRGNAM="apg"
+VERSION="2.2.3"
+HOMEPAGE="http://www.adel.nursat.kz/apg/index.shtml"
+DOWNLOAD="http://www.adel.nursat.kz/apg/download/apg-2.2.3.tar.gz"
+MD5SUM="3b3fc4f11e90635519fe627c1137c9ac"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Georgy Shepelev"
+EMAIL="geo.shepelev@gmail.com"
+APPROVED="Niels Horn"
diff --git a/system/apg/slack-desc b/system/apg/slack-desc
new file mode 100644
index 0000000000..306c01d1ab
--- /dev/null
+++ b/system/apg/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------------------------------------------------------|
+apg: apg (Automated Password Generator)
+apg:
+apg: APG is a tool set for random password generation.
+apg:
+apg: Homepage: http://www.adel.nursat.kz/apg/index.shtml
+apg:
+apg:
+apg:
+apg:
+apg:
+apg: