diff --git a/Library/Homebrew/shims/mac/super/bsdmake b/Library/Homebrew/shims/mac/super/bsdmake
deleted file mode 100755
index 893e19f7f6..0000000000
--- a/Library/Homebrew/shims/mac/super/bsdmake
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export HOMEBREW_CCCFG="O${HOMEBREW_CCCFG}"
-exec xcrun bsdmake "$@"
diff --git a/Library/Homebrew/shims/mac/super/bsdmake b/Library/Homebrew/shims/mac/super/bsdmake
new file mode 120000
index 0000000000..ac08cdcf95
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/bsdmake
@@ -0,0 +1 @@
+make
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/make b/Library/Homebrew/shims/mac/super/make
index 6677f67329..3c29e70b9c 100755
--- a/Library/Homebrew/shims/mac/super/make
+++ b/Library/Homebrew/shims/mac/super/make
@@ -1,4 +1,12 @@
 #!/bin/bash
 
 export HOMEBREW_CCCFG="O${HOMEBREW_CCCFG}"
-exec xcrun "make" "$@"
+
+SHIM_FILE="${0##*/}"
+
+if xcrun --find "${SHIM_FILE}" &>/dev/null
+then
+  exec xcrun "${SHIM_FILE}" "$@"
+else
+  exec xcrun make "$@"
+fi