diff --git a/Makefile b/Makefile
index 76223318d..6f8564ff9 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ install: gitreceive sshcommand pluginhook
 	cp nginx-app-conf /home/git/nginx-app-conf
 	mkdir -p /var/lib/dokku/plugins
 	cp -r plugins/* /var/lib/dokku/plugins
+	PLUGIN_PATH=/var/lib/dokku/plugins pluginhook install
 
 gitreceive:
 	wget -qO /usr/local/bin/gitreceive ${GITRECEIVE_URL}
@@ -26,4 +27,4 @@ pluginhook:
 	cd /tmp && dpkg -i pluginhook_0.1.0_amd64.deb
 
 count:
-	cat receiver dokku bootstrap.sh nginx-app-conf nginx-reloader.conf | wc -l
\ No newline at end of file
+	cat receiver dokku bootstrap.sh nginx-app-conf | wc -l
\ No newline at end of file
diff --git a/bootstrap.sh b/bootstrap.sh
index 67183a241..7b59ea115 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -15,9 +15,6 @@ cd dokku && make install
 
 curl "$DOKKU_STACK" | gunzip -cd | docker import - progrium/buildstep
 
-PLUGIN_PATH=/var/lib/dokku/plugins
-pluginhook install
-
 echo
 echo "Be sure to upload a public key for your user:"
 echo "  cat ~/.ssh/id_rsa.pub | ssh root@$HOSTNAME \"gitreceive upload-key progrium\""
diff --git a/plugins/00_dokku-standard/install b/plugins/00_dokku-standard/install
index aff71d664..8009189a7 100755
--- a/plugins/00_dokku-standard/install
+++ b/plugins/00_dokku-standard/install
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-sed -i 's/docker -d/docker -d -r=true/' /etc/init/docker.conf
+[[ $(cat /etc/init/docker.conf | grep r=true) ]] || sed -i 's/docker -d/docker -d -r=true/' /etc/init/docker.conf
 
 echo $HOSTNAME > /home/git/HOSTNAME
\ No newline at end of file