diff --git a/Makefile b/Makefile
index b42156fd5..a29f02c2a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,15 +6,15 @@ STACK_URL ?= https://github.com/progrium/buildstep.git
 PREBUILT_STACK_URL ?= https://github.com/progrium/buildstep/releases/download/2014-03-08/2014-03-08_429d4a9deb.tar.gz
 DOKKU_ROOT ?= /home/dokku
 
-# If the first argument is "dokku"...
-ifeq (dokku,$(firstword $(MAKECMDGOALS)))
-  # use the rest as arguments for "dokku"
+# If the first argument is "vagrant-dokku"...
+ifeq (vagrant-dokku,$(firstword $(MAKECMDGOALS)))
+  # use the rest as arguments for "vagrant-dokku"
   RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
   # ...and turn them into do-nothing targets
   $(eval $(RUN_ARGS):;@:)
 endif
 
-.PHONY: all install copyfiles version plugins dependencies sshcommand pluginhook docker aufs stack count acl-add dokku
+.PHONY: all install copyfiles version plugins dependencies sshcommand pluginhook docker aufs stack count vagrant-acl-add vagrant-dokku
 
 all:
 	# Type "make install" to install.
@@ -80,8 +80,8 @@ count:
 	@echo "Test lines:"
 	@find tests -type f | xargs cat | wc -l
 
-acl-add:
+vagrant-acl-add:
 	vagrant ssh -- sudo sshcommand acl-add dokku $(USER)
 
-dokku:
+vagrant-dokku:
 	vagrant ssh -- "sudo -H -u root bash -c 'dokku $(RUN_ARGS)'"
diff --git a/docs/installation.md b/docs/installation.md
index 79b6e5815..5855e7275 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -118,7 +118,7 @@ sudo BUILD_STACK=true make install
 - Add SSH key to Dokku using `sshcommand`:
 
     ```bash
-    cat ~/.ssh/id_rsa.pub | make acl-add
+    cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
     ```
 
 You are now ready to deploy an app or install plugins.