diff --git a/Makefile b/Makefile
index 266fa2a9a4..26b8941969 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,11 @@ DOCKER_ENVS := \
 	-e TIMEOUT
 # note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds
 
-# to allow `make BINDDIR=. shell` or `make BINDDIR= test`
+# to allow `make BIND_DIR=. shell` or `make BIND_DIR= test`
 # (default to no bind mount if DOCKER_HOST is set)
-BINDDIR := $(if $(DOCKER_HOST),,bundles)
-DOCKER_MOUNT := $(if $(BINDDIR),-v "$(CURDIR)/$(BINDDIR):/go/src/github.com/docker/docker/$(BINDDIR)")
+# note: BINDDIR is supported for backwards-compatibility here
+BIND_DIR := $(if $(BINDDIR),$(BINDDIR),$(if $(DOCKER_HOST),,bundles))
+DOCKER_MOUNT := $(if $(BIND_DIR),-v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/docker/docker/$(BIND_DIR)")
 
 # to allow `make DOCSDIR=docs docs-shell` (to create a bind mount in docs)
 DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR)/$(DOCSDIR):/$(DOCSDIR))
diff --git a/docs/sources/contributing/devenvironment.md b/docs/sources/contributing/devenvironment.md
index 21d533686c..c4072c9aa2 100644
--- a/docs/sources/contributing/devenvironment.md
+++ b/docs/sources/contributing/devenvironment.md
@@ -73,13 +73,13 @@ To create the Docker binary, run this command:
     $ make binary
 
 This will create the Docker binary in `./bundles/<version>-dev/binary/`. If you
-do not see files in the `./bundles` directory in your host, your `BINDDIR`
-setting is not set quite right. You want to run the following command: 
-    
-    $ make BINDDIR=. binary 
+do not see files in the `./bundles` directory in your host, your `BIND_DIR`
+setting is not set quite right. You want to run the following command:
+
+    $ make BIND_DIR=. binary
 
 If you are on a non-Linux platform, e.g., OSX, you'll want to run `make cross`
-or `make BINDDIR=. cross`.
+or `make BIND_DIR=. cross`.
 
 ### Using your built Docker binary
 
diff --git a/pkg/jsonlog/jsonlog_marshalling.go b/pkg/jsonlog/jsonlog_marshalling.go
index 6c7f73a90d..6244eb01a4 100644
--- a/pkg/jsonlog/jsonlog_marshalling.go
+++ b/pkg/jsonlog/jsonlog_marshalling.go
@@ -1,7 +1,7 @@
 // This code was initially generated by ffjson <https://github.com/pquerna/ffjson>
 // This code was generated via the following steps:
 // $ go get -u github.com/pquerna/ffjson
-// $ make shell BINDDIR=.
+// $ make BIND_DIR=. shell
 // $ ffjson pkg/jsonlog/jsonlog.go
 // $ mv pkg/jsonglog/jsonlog_ffjson.go pkg/jsonlog/jsonlog_marshalling.go
 //