diff --git a/README.dev.md b/README.dev.md
index 7161228c64..9b30ac2b41 100644
--- a/README.dev.md
+++ b/README.dev.md
@@ -332,7 +332,7 @@ Finally continue with the All Systems instructions below.
 pip install --no-deps -r requirements.txt
 ./tools/install-phantomjs
 ./tools/install-mypy
-./tools/download-zxcvbn
+./tools/setup/download-zxcvbn
 ./tools/emoji_dump/build_emoji
 ./scripts/setup/generate_secrets.py -d
 if [ $(uname) = "OpenBSD" ]; then sudo cp ./puppet/zulip/files/postgresql/zulip_english.stop /var/postgresql/tsearch_data/; else sudo cp ./puppet/zulip/files/postgresql/zulip_english.stop /usr/share/postgresql/9.3/tsearch_data/; fi
diff --git a/provision.py b/provision.py
index bd81295147..019d62c82d 100644
--- a/provision.py
+++ b/provision.py
@@ -167,7 +167,7 @@ def main():
         run(["tools/install-phantomjs", "--travis"])
     else:
         run(["tools/install-phantomjs"])
-    run(["tools/download-zxcvbn"])
+    run(["tools/setup/download-zxcvbn"])
     run(["tools/emoji_dump/build_emoji"])
     run(["scripts/setup/generate_secrets.py", "-d"])
     if "--travis" in sys.argv:
diff --git a/tools/download-zxcvbn b/tools/setup/download-zxcvbn
similarity index 100%
rename from tools/download-zxcvbn
rename to tools/setup/download-zxcvbn
diff --git a/tools/update-prod-static b/tools/update-prod-static
index 3e71a94c00..9841615364 100755
--- a/tools/update-prod-static
+++ b/tools/update-prod-static
@@ -38,7 +38,7 @@ subprocess.check_call(['bash', '-ex', 'tools/emoji_dump/build_emoji'],
                       stdout=fp, stderr=fp)
 
 # Download and include zxcvbn.js
-subprocess.check_call(['bash', '-ex', 'tools/download-zxcvbn'],
+subprocess.check_call(['bash', '-ex', 'tools/setup/download-zxcvbn'],
                       stdout=fp, stderr=fp)
 
 # Collect the files that we're going to serve.