diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index ed94a314ea5..811576a0d44 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,13 +1,15 @@
 # Template file for 'cups'
 pkgname=cups
 version=1.5.3
-revision=7
+revision=8
 patch_args="-Np1"
 homepage="http://www.cups.org/"
 license="GPL-2"
 distfiles="ftp://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"
 depends="libcups>=${version}_${revision} cups-filters"
-makedepends="automake acl-devel jpeg-devel libpng-devel>=1.5.10 tiff-devel openssl-devel pam-devel mit-krb5-devel poppler-devel libusb-devel avahi-libs-devel systemd-devel gnutls-devel"
+makedepends="automake perl pkg-config acl-devel jpeg-devel libpng-devel>=1.5.10 tiff-devel
+openssl-devel pam-devel mit-krb5-devel poppler-devel libusb-devel avahi-libs-devel
+systemd-devel gnutls-devel"
 short_desc="Common Unix Printing System"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d
@@ -83,7 +85,15 @@ do_install() {
 
 	# Remove files provided by cups-filters (obsolete in 1.6 as well).
 	rm -f ${DESTDIR}/usr/lib/cups/backend/{parallel,serial}
-	rm -f ${DESTDIR}/usr/lib/cups/filter/{commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops}
-	rm -f ${DESTDIR}/usr/share/cups/banners/{classified,confidential,secret,standard,topsecret,unclassified}
-	rm -f ${DESTDIR}/usr/share/cups/data/testprint
+	for f in bannertops commandtoescpx commandtopclx imagetops \
+		imagetoraster pdftops rastertoescpx rastertopclx \
+		texttops; do
+		rm -f ${DESTDIR}/usr/lib/cups/filter/${f}
+	done
+	rm -f ${DESTDIR}/usr/share/cups/banners/*
+	rm -f ${DESTDIR}/usr/share/cups/data/{testprint,psglyphs}
+	rm -f ${DESTDIR}/usr/share/cups/fonts/*
+	# comment out all conversion rules which use any of the removed filters
+	perl -p -i -e 's:^(.*\s+(pdftops|texttops|imagetops|bannertops|imagetoraster)\s*)$:#\1:' \
+		${DESTDIR}/usr/share/cups/mime/mime.convs
 }