diff --git a/common/shlibs b/common/shlibs
index ee40d8db867..019cd0218c3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1743,3 +1743,5 @@ libnetfilter_acct.so.1 libnetfilter_acct-1.0.2_1
 libnetfilter_conntrack.so.3 libnetfilter_conntrack-1.0.4_1
 libmsgpack.so.3 msgpack-0.5.9_1
 libewf.so.2 libewf-20140608_1
+libcupsfilters.so.1 cups-filters-1.0.58_2
+libfontembed.so.1 cups-filters-1.0.58_2
diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index b281d497945..510b99cb6cf 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,9 +1,9 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
 version=1.0.58
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-rcdir=no --enable-avahi
+configure_args="--disable-static --with-rcdir=no --enable-avahi
  --with-browseremoteprotocols=DNSSD,CUPS"
 hostmakedepends="pkg-config ghostscript poppler-utils"
 makedepends="lcms2-devel libpng-devel>=1.6 libqpdf-devel
@@ -11,7 +11,6 @@ makedepends="lcms2-devel libpng-devel>=1.6 libqpdf-devel
  ghostscript-devel>=9.10 cups-devel"
 depends="ghostscript poppler-utils"
 conf_files="/etc/cups/cups-browsed.conf"
-systemd_services="cups-browsed.service on"
 short_desc="The OpenPrinting CUPS Filters"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1, MIT"
@@ -22,13 +21,31 @@ checksum=6e704e0eac6968076d0596e0c9512f8c88bc9e0dbc934c8846f6375c93b80b2e
 lib32disabled=yes
 disable_parallel_build=yes
 
-post_install() {
-	# remove development stuff.
-	rm -rf ${DESTDIR}/usr/include
-	rm -f ${DESTDIR}/usr/lib/*.a
-	# install systemd service
-	rm -rf ${DESTDIR}/etc/rc.d
+build_options="systemd"
+if [ "$build_option_systemd" ]; then
+	systemd_services="cups-browsed.service on"
+fi
 
-	vinstall utils/cups-browsed.service 644 usr/lib/systemd/system
+post_install() {
+	if [ "$build_option_systemd" ]; then
+		vinstall utils/cups-browsed.service 644 usr/lib/systemd/system
+	fi
 	chgrp -R lp ${DESTDIR}/etc/cups
 }
+
+libcups-filters_package() {
+	short_desc+=" - shared library"
+	pkg_install() {
+		vmove usr/lib/*.so.*
+	}
+}
+
+libcups-filters-devel_package() {
+	short_desc+=" - development files"
+	depends="libcups-filters>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
+	}
+}
diff --git a/srcpkgs/libcups-filters b/srcpkgs/libcups-filters
new file mode 120000
index 00000000000..4f1a5341b31
--- /dev/null
+++ b/srcpkgs/libcups-filters
@@ -0,0 +1 @@
+cups-filters
\ No newline at end of file
diff --git a/srcpkgs/libcups-filters-devel b/srcpkgs/libcups-filters-devel
new file mode 120000
index 00000000000..4f1a5341b31
--- /dev/null
+++ b/srcpkgs/libcups-filters-devel
@@ -0,0 +1 @@
+cups-filters
\ No newline at end of file