diff --git a/NEWS.md b/NEWS.md
index 158cb6562..644c7f040 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,6 @@
 `master`
 
+* No longer generate `mkdir -p .git/safe` as part of `bin/setup`
 * Update Bitters to 1.7
 * Update Neat to 2.1
 * Update Bourbon to 5.0.0.beta.8
diff --git a/templates/bin_setup b/templates/bin_setup
index 6f1eb65fe..7610df89e 100644
--- a/templates/bin_setup
+++ b/templates/bin_setup
@@ -13,8 +13,12 @@ bundle check || bundle install
 # Set up database and add any development seed data
 bin/rails dev:prime
 
-# Add binstubs to PATH via export PATH=".git/safe/../../bin:$PATH" in ~/.zshenv
-mkdir -p .git/safe
+if [ ! -d .git/safe ] && echo $PATH | grep .git/safe > /dev/null; then
+  echo "-----------------------------------------------------------------------"
+  echo
+  echo "-> When you trust this repo, remember to run: mkdir -p .git/safe"
+  echo
+fi
 
 # Only if this isn't CI
 # if [ -z "$CI" ]; then