diff --git a/docs/remote-commands.md b/docs/remote-commands.md
index 262b299b9..4bc907359 100644
--- a/docs/remote-commands.md
+++ b/docs/remote-commands.md
@@ -17,3 +17,14 @@ It's possible to run commands in the environment of the deployed application:
 dokku run node-js-app ls -alh
 dokku run <app> <cmd>
 ```
+
+## Behavioral modifiers
+
+Dokku also supports certain command-line arguments that augment it's behavior. If using these over ssh, you must use the form `ssh -t dokku@dokku.me -- <command>`
+in order to avoid ssh interpretting dokku arguments for itself.
+
+```shell
+-q|--quiet            suppress output headers
+-t|--trace            enable DOKKU_TRACE for current execution only
+--rm|--rm-container    remove docker container after successful dokku run <app> <command>
+```
diff --git a/dokku b/dokku
index 3310ceeed..a2a6a59f5 100755
--- a/dokku
+++ b/dokku
@@ -184,7 +184,7 @@ case "$1" in
     ;;
 
   help|'')
-    echo "Usage: dokku [-q|--quiet|-t|--trace|--rm-container|-rm] COMMAND <app> [command-specific-options]"
+    echo "Usage: dokku [-q|--quiet|-t|--trace|--rm-container|--rm] COMMAND <app> [command-specific-options]"
     echo ""
     echo "Options:"
 
diff --git a/plugins/common/functions b/plugins/common/functions
index 1aae487f5..ec398033a 100644
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -61,7 +61,7 @@ function parse_args() {
       --trace|-t)
         export DOKKU_TRACE=1
         ;;
-      --rm-container|-rm)
+      --rm-container|--rm)
         export DOKKU_RM_CONTAINER=1
         ;;
       --force|-f)