diff --git a/dokku b/dokku
index c48397b980d..1462d1619ef 100755
--- a/dokku
+++ b/dokku
@@ -37,7 +37,7 @@ fi
 
 if [[ -n "$SSH_ORIGINAL_COMMAND" ]]; then
   export -n SSH_ORIGINAL_COMMAND
-  if [[ $1 =~ config-* ]];then
+  if [[ $1 =~ config-* ]] || [[ $1 =~ docker-options* ]];then
     xargs $0 <<<$SSH_ORIGINAL_COMMAND
     exit $?
   else
diff --git a/tests/unit/docker-options.bats b/tests/unit/docker-options.bats
index c2b097eb2de..d10f346e7f3 100644
--- a/tests/unit/docker-options.bats
+++ b/tests/unit/docker-options.bats
@@ -149,3 +149,14 @@ teardown() {
   assert_success
   deploy_app
 }
+
+@test "docker-options:add (all phases over SSH)" {
+  run ssh dokku@dokku.me docker-options:add $TEST_APP build,deploy,run \"-v /tmp\"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  run /bin/bash -c "dokku docker-options $TEST_APP | egrep '\-v /tmp' | wc -l | grep -q 3"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}