diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
deleted file mode 100644
index 738f8a2..0000000
--- a/app-text/xpdf/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST xpdf-3.04.tar.gz 825519 SHA256 11390c74733abcb262aaca4db68710f13ffffd42bfe2a0861a5dfc912b2977e5 SHA512 3fb3c380fdbd13d937449ae3f7d7a163815cc85296d30be7b9907687884385d6171bb48ee5d5c13368d6bba87740b678f491bdcf61b38d130809e9afa260f6cf WHIRLPOOL 0787d42de82f7907a4f7a0e35aa7d95366db003628857da01ed12b3c7008ce88cdfb2dd6a08155b9a6b9bfd1b70c8aedf67b0b1fd41a77f17253576b1d3aac4a
-EBUILD xpdf-3.04.ebuild 841 SHA256 28282d727a23c3539715c8333ed9521de868f580626b799107b0a14477c84b36 SHA512 1044926111dd3870af979229c48bd1819e1c59146d195d8c087a9ed9c7721b04ff27804884b2c03108a80d3544f00d7cdc0014f06242bb97895868be1bd522a3 WHIRLPOOL e9650b801a9916bc0481ac2dc7d13c7bcab2afa5075d3e8fba4b79a60a9fba2d0cbd0f8631b3563d8a622a47c95327cfe237f989b3031a7034508629fab8758f
diff --git a/app-text/xpdf/xpdf-3.04.ebuild b/app-text/xpdf/xpdf-3.04.ebuild
deleted file mode 100644
index 8ad7325..0000000
--- a/app-text/xpdf/xpdf-3.04.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r4.ebuild,v 1.12 2011/10/18 21:56:02 dilfridge Exp $
-
-EAPI=4
-
-inherit fdo-mime gnome2 eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="An X Viewer for PDF Files"
-HOMEPAGE="http://www.foolabs.com/xpdf/"
-SRC_URI="ftp://ftp.foolabs.com/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 x86-fbsd"
-
-IUSE="-X"
-
-RDEPEND="
-	media-libs/libpng
-	sys-libs/zlib
-	X? ( media-libs/freetype
-	     x11-libs/motif
-	     x11-libs/libX11
-	     x11-libs/libXpm )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_configure() {
-	if use X; then
-		myconf+=(
-			--with-freetype2-includes=/usr/include/freetype2
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
diff --git a/mail-filter/assp/assp-2.6.1-r17355.ebuild b/mail-filter/assp/assp-2.6.1-r17355.ebuild
index 6d95486..07d39f5 100644
--- a/mail-filter/assp/assp-2.6.1-r17355.ebuild
+++ b/mail-filter/assp/assp-2.6.1-r17355.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-2.6.1-r17355.ebuild,v 1.0 2017/01/26 21:15:28 jdeckert Exp $
 
-EAPI=5
+EAPI=6
 
 inherit eutils user
 
@@ -146,14 +146,14 @@ src_install() {
 	fowners assp:assp -R /opt/assp
 	fperms 755 /opt/assp/assp-monitor.pl /opt/assp/assp.pl /opt/assp/assp_pop3.pl
 
-	# Install the init.d script to listen
 	newinitd "${FILESDIR}/asspd.init" asspd
+	systemd_dounit "${FILESDIR}/assp.service"
 }
 
 pkg_postinst() {
 	elog
-	elog "To configure ASSP, start /etc/init.d/asspd then point"
-	elog "your browser to http://localhost:55555"
+	elog "To configure ASSP, point your browser to"
+	elog "http://localhost:55555"
 	elog "Username: admin  Password: nospam4me (CHANGE ASAP!)"
 	elog
 	elog "File permissions have been set to use assp:assp"
diff --git a/mail-filter/assp/files/assp.service b/mail-filter/assp/files/assp.service
new file mode 100644
index 0000000..dfcd3c4
--- /dev/null
+++ b/mail-filter/assp/files/assp.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=AntiSpam SMTP Proxy
+After=network.target
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/bin/perl /opt/assp/assp.pl /opt/assp/
+ExecStop=/usr/bin/killall /usr/bin/perl
+[Install]
+WantedBy=multi-user.target
diff --git a/mail-filter/assp/files/asspd.init b/mail-filter/assp/files/asspd.init
old mode 100644
new mode 100755
index e37090c..e59947f
--- a/mail-filter/assp/files/asspd.init
+++ b/mail-filter/assp/files/asspd.init
@@ -5,11 +5,12 @@
 
 depend() {
         need net
+        use antivirus mta precursor
 }
 
 start() {
         ebegin "Starting ASSP"
-        start-stop-daemon -b --start --quiet --startas /opt/assp/assp.pl \
+        start-stop-daemon --start --quiet --startas /opt/assp/assp.pl \
                 --interpreted --pidfile /opt/assp/pid -- /opt/assp/
                        2<&1 > /dev/null
         eend $?