diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..aeb8db5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+all:
+	docker rm run-debian2docker
+	docker build -t debian2docker .
+	docker run -i -t --privileged --name run-debian2docker debian2docker
+	docker cp run-debian2docker:/debian2docker.iso .
+
diff --git a/hooks/build-vbox-guest.chroot b/hooks/build-vbox-guest.chroot
index 0188fe7..cf6ae33 100755
--- a/hooks/build-vbox-guest.chroot
+++ b/hooks/build-vbox-guest.chroot
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Build VBox guest additions
-VBOX_VERSION=5.0.2
+VBOX_VERSION=6.0.4
 
 mkdir -p /vboxguest
 cd /vboxguest
diff --git a/hooks/docker.chroot b/hooks/docker.chroot
index f452cd6..f65a922 100755
--- a/hooks/docker.chroot
+++ b/hooks/docker.chroot
@@ -4,11 +4,11 @@ set -e
 
 if [ ! -f /usr/bin/docker ]
 then
-wget https://get.docker.io/builds/Linux/x86_64/docker-latest.tgz -O /tmp/docker.tgz
+wget https://download.docker.com/linux/static/stable/x86_64/docker-18.09.1.tgz -O /tmp/docker.tgz
 mkdir /tmp/docker
 tar -xpf /tmp/docker.tgz -C /tmp/docker/
 rm /tmp/docker.tgz
-mv /tmp/docker/usr/local/bin/docker /usr/bin/docker
+mv /tmp/docker/docker/* /usr/bin/
 rm -rf /tmp/docker
 fi
 
diff --git a/includes.chroot/etc/init.d/docker b/includes.chroot/etc/init.d/docker
index 2120503..aa23724 100755
--- a/includes.chroot/etc/init.d/docker
+++ b/includes.chroot/etc/init.d/docker
@@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
 BASE=$(basename $0)
 
 # modify these in /etc/default/$BASE (/etc/default/docker)
-DOCKER=/usr/bin/$BASE
+DOCKER=/usr/bin/dockerd
 DOCKER_PIDFILE=/var/run/$BASE.pid
 DOCKER_LOGFILE=/var/log/$BASE.log
 DOCKER_OPTS=
@@ -109,7 +109,7 @@ case "$1" in
 			--exec "$DOCKER" \
 			--pidfile "$DOCKER_PIDFILE" \
 			-- \
-				-d -p "$DOCKER_PIDFILE" \
+				-p "$DOCKER_PIDFILE" \
 				$DOCKER_OPTS \
 				-g "$DOCKER_DIR" -H unix:// \
 					>> "$DOCKER_LOGFILE" 2>&1