diff --git a/dokku b/dokku
index 8b95f9b9e..956631a57 100755
--- a/dokku
+++ b/dokku
@@ -100,7 +100,9 @@ EOF
     ;;
 
   *)
-    pluginhook commands "$@"
+    for script in $(ls -d /var/lib/dokku/plugins/*/commands); do
+      $script "$@"
+    done
     ;;
 
 esac
diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands
index 5dd309c57..7ebf92703 100755
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -84,4 +84,4 @@ EOF
     ;;
 
 esac
-cat
+
diff --git a/plugins/backup/commands b/plugins/backup/commands
index 7386d7ed1..4f2713be1 100755
--- a/plugins/backup/commands
+++ b/plugins/backup/commands
@@ -75,4 +75,4 @@ EOF
     ;;
 
 esac
-cat
+
diff --git a/plugins/config/commands b/plugins/config/commands
index 5b1dbccad..5996891ed 100755
--- a/plugins/config/commands
+++ b/plugins/config/commands
@@ -173,4 +173,4 @@ EOF
   ;;
 
 esac
-cat
+
diff --git a/plugins/git/commands b/plugins/git/commands
index 22290bab5..af6c8ff31 100755
--- a/plugins/git/commands
+++ b/plugins/git/commands
@@ -35,6 +35,8 @@ EOF
     git-shell -c "$args"
     ;;
 
+  help)
+    cat
+    ;;
 esac
-cat
 
diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands
index 99e5dbeff..7c878d672 100755
--- a/plugins/nginx-vhosts/commands
+++ b/plugins/nginx-vhosts/commands
@@ -1,3 +1,2 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-cat