--- /usr/portage/app-emulation/docker/docker-1.4.1.ebuild	2014-12-23 10:34:26.000000000 -0600
+++ /usr/portage/app-emulation/docker/docker-1.4.1.ebuild	2015-02-04 15:39:19.256152004 -0600
@@ -20,7 +20,7 @@ 
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 fi
 
-inherit bash-completion-r1 linux-info multilib systemd udev user
+inherit bash-completion-r1 linux-info multilib systemd udev user eutils
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -134,6 +134,8 @@ 
 }
 
 src_prepare() {
+    # Don't use /var/run
+    epatch "${FILESDIR}/${P}-var-run.patch"
 	# allow user patches (use sparingly - upstream won't support them)
 	epatch_user
 }
@@ -212,6 +214,9 @@ 
 		mkdir -p "${D}/usr/share/${PN}/contrib"
 		cp -R contrib/* "${D}/usr/share/${PN}/contrib"
 	fi
+
+    echo -n "DOCKER_HOST=\"unix:///run/docker.unix\"" > "${T}/90docker"
+	doenvd "${T}/90docker"
 }
 
 pkg_postinst() {