diff --git a/srcpkgs/distcc-pump b/srcpkgs/distcc-pump
new file mode 120000
index 0000000000..fa7d8db949
--- /dev/null
+++ b/srcpkgs/distcc-pump
@@ -0,0 +1 @@
+distcc
\ No newline at end of file
diff --git a/srcpkgs/distcc/distcc-pump.template b/srcpkgs/distcc/distcc-pump.template
new file mode 100644
index 0000000000..0e45d99674
--- /dev/null
+++ b/srcpkgs/distcc/distcc-pump.template
@@ -0,0 +1,13 @@
+# Template file for 'distcc-pump'.
+#
+depends="distcc-${version}_${revision}"
+short_desc="${short_desc} -- Pump mode support files"
+pycompile_module="include_server"
+
+do_install() {
+	vmove usr/bin/pump usr/bin
+	vmove usr/share/man/man1/pump.1.gz usr/share/man/man1
+	vmove usr/share/man/man1/include_server.1.gz usr/share/man/man1
+	vmove usr/lib/python2.7 usr/lib
+	vmove usr/share/doc/distcc/README.pump usr/share/doc/distcc
+}
diff --git a/srcpkgs/distcc/files/distccd.service b/srcpkgs/distcc/files/distccd.service
new file mode 100644
index 0000000000..1beb6542fd
--- /dev/null
+++ b/srcpkgs/distcc/files/distccd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=A distributed C/C++ compiler
+Documentation=man:distccd(1)
+After=network.target
+
+[Service]
+User=nobody
+ExecStart=/usr/bin/distccd --no-detach --daemon --allow 127.0.0.1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index d83cf32ec6..a6b6a4a545 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -1,7 +1,8 @@
 # Template file for 'distcc'
 pkgname=distcc
 version=3.2rc1
-revision=1
+revision=2
+subpackages="distcc-pump"
 build_style=gnu-configure
 makedepends="pkg-config python-devel popt-devel avahi-libs-devel"
 short_desc="Distributed compilation for faster C/C++ builds"
@@ -13,9 +14,15 @@ checksum=311671e844625d7fdb18dd3d096cd855751cfe8de13827682bcb7beff9133b30
 CFLAGS=-w
 
 conf_files="
-/etc/distcc/commands.allow.sh
 /etc/distcc/hosts
-/etc/distcc/clients.allow
-/etc/default/distc"
+/etc/distcc/clients.allow"
 
-pycompile_module="include_server"
+post_install() {
+	# Remove useless files.
+	rm -f ${DESTDIR}/etc/default/distcc
+	rm -f ${DESTDIR}/etc/distcc/commands.allow.sh
+	rm -rf ${DESTDIR}/usr/share/doc/distcc/example
+
+	# systemd service
+	vinstall ${FILESDIR}/distccd.service 644 usr/lib/systemd/system
+}