diff --git a/Makefile b/Makefile
index b8529d87e..76223318d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@ install: gitreceive sshcommand pluginhook
 	cp dokku /usr/local/bin/dokku
 	cp receiver /home/git/receiver
 	cp nginx-app-conf /home/git/nginx-app-conf
-	cp -r plugins /home/git/.plugins
+	mkdir -p /var/lib/dokku/plugins
+	cp -r plugins/* /var/lib/dokku/plugins
 
 gitreceive:
 	wget -qO /usr/local/bin/gitreceive ${GITRECEIVE_URL}
diff --git a/bootstrap.sh b/bootstrap.sh
index d68e12b7f..67183a241 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -15,7 +15,7 @@ cd dokku && make install
 
 curl "$DOKKU_STACK" | gunzip -cd | docker import - progrium/buildstep
 
-PLUGINPATH=/home/git/.plugins
+PLUGIN_PATH=/var/lib/dokku/plugins
 pluginhook install
 
 echo
diff --git a/dokku b/dokku
index 341a81f53..4c30ed233 100755
--- a/dokku
+++ b/dokku
@@ -1,5 +1,5 @@
 #!/bin/bash
-PLUGIN_PATH="$HOME/.plugins"
+export PLUGIN_PATH="/var/lib/dokku/plugins"
 set -e; case "$1" in
   receive)
     APP="$2"; IMAGE="app/$APP"
@@ -53,6 +53,7 @@ set -e; case "$1" in
     ;;
 
   *)
+    shift
     pluginhook commands "$@"
     ;;