diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
index bed77b13401..63960aa2f98 100755
--- a/srcpkgs/docker/files/docker/run
+++ b/srcpkgs/docker/files/docker/run
@@ -1,3 +1,4 @@
 #!/bin/sh
+[ -r conf ] && . ./conf
 modprobe -q loop || exit 1
-exec chpst -o 1048576 -p 1048576 docker -d 2>/dev/null
+exec chpst -o 1048576 -p 1048576 docker -d $OPTS 2>/dev/null
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 4872d39bf71..fa510497755 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,10 +1,10 @@
 # Template file for 'docker'
 pkgname=docker
 version=1.6.2
-revision=1
+revision=2
 hostmakedepends="git go"
 makedepends="libbtrfs-devel sqlite-devel device-mapper-devel"
-short_desc="Easily create lightweight, portable, self-sufficient containers from any application"
+short_desc="Pack, ship and run any application as a lightweight container"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Apache-2.0"
 homepage="http://www.docker.io"
@@ -12,7 +12,6 @@ system_groups="docker"
 
 # These are required at run-time.
 depends="iptables xz git"
-build_options="systemd"
 nostrip=yes
 nocross=yes
 
@@ -28,8 +27,5 @@ do_install() {
 	vinstall bundles/${version}/dynbinary/dockerinit-${version} 755 usr/lib/docker dockerinit
 	vinstall contrib/completion/bash/docker 644 usr/share/bash-completion/completions
 	vinstall contrib/completion/zsh/_docker 644 usr/share/zsh/site-functions
-	if [ "$build_option_systemd" ]; then
-		vinstall contrib/init/systemd/docker.service 644 usr/lib/systemd/system
-	fi
 	vsv docker
 }