diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
index 9c6db80027..841ff04202 100644
--- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb
@@ -5,8 +5,7 @@ module Superenv
     # @private
     def bin
       return unless DevelopmentTools.installed?
-
-      (HOMEBREW_SHIMS_PATH/"super").realpath
+      (HOMEBREW_SHIMS_PATH/"mac/super").realpath
     end
   end
 
diff --git a/Library/Homebrew/shims/super/ant b/Library/Homebrew/shims/mac/super/ant
similarity index 100%
rename from Library/Homebrew/shims/super/ant
rename to Library/Homebrew/shims/mac/super/ant
diff --git a/Library/Homebrew/shims/super/apr-1-config b/Library/Homebrew/shims/mac/super/apr-1-config
similarity index 100%
rename from Library/Homebrew/shims/super/apr-1-config
rename to Library/Homebrew/shims/mac/super/apr-1-config
diff --git a/Library/Homebrew/shims/super/bsdmake b/Library/Homebrew/shims/mac/super/bsdmake
similarity index 100%
rename from Library/Homebrew/shims/super/bsdmake
rename to Library/Homebrew/shims/mac/super/bsdmake
diff --git a/Library/Homebrew/shims/mac/super/c++ b/Library/Homebrew/shims/mac/super/c++
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/c++
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/c89 b/Library/Homebrew/shims/mac/super/c89
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/c89
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/c99 b/Library/Homebrew/shims/mac/super/c99
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/c99
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/cc b/Library/Homebrew/shims/mac/super/cc
new file mode 120000
index 0000000000..76ba8b5370
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/cc
@@ -0,0 +1 @@
+../../super/cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/clang b/Library/Homebrew/shims/mac/super/clang
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/clang
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/clang++ b/Library/Homebrew/shims/mac/super/clang++
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/clang++
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/cpp b/Library/Homebrew/shims/mac/super/cpp
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/cpp
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/g++ b/Library/Homebrew/shims/mac/super/g++
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/g++
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/g++-4.2 b/Library/Homebrew/shims/mac/super/g++-4.2
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/g++-4.2
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/g++-4.3 b/Library/Homebrew/shims/mac/super/g++-4.3
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/g++-4.3
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/g++-4.4 b/Library/Homebrew/shims/mac/super/g++-4.4
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/g++-4.4
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/g++-4.5 b/Library/Homebrew/shims/mac/super/g++-4.5
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/g++-4.5
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/g++-4.6 b/Library/Homebrew/shims/mac/super/g++-4.6
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/g++-4.6
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/g++-4.7 b/Library/Homebrew/shims/mac/super/g++-4.7
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/g++-4.7
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/g++-4.8 b/Library/Homebrew/shims/mac/super/g++-4.8
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/g++-4.8
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/g++-4.9 b/Library/Homebrew/shims/mac/super/g++-4.9
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/g++-4.9
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/g++-5 b/Library/Homebrew/shims/mac/super/g++-5
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/g++-5
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/g++-6 b/Library/Homebrew/shims/mac/super/g++-6
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/g++-6
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/g++-7 b/Library/Homebrew/shims/mac/super/g++-7
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/g++-7
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/gcc b/Library/Homebrew/shims/mac/super/gcc
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/gcc
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/gcc-4.2 b/Library/Homebrew/shims/mac/super/gcc-4.2
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/gcc-4.2
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/gcc-4.3 b/Library/Homebrew/shims/mac/super/gcc-4.3
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/gcc-4.3
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/gcc-4.4 b/Library/Homebrew/shims/mac/super/gcc-4.4
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/gcc-4.4
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/gcc-4.5 b/Library/Homebrew/shims/mac/super/gcc-4.5
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/gcc-4.5
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/gcc-4.6 b/Library/Homebrew/shims/mac/super/gcc-4.6
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/gcc-4.6
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/gcc-4.7 b/Library/Homebrew/shims/mac/super/gcc-4.7
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/gcc-4.7
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/gcc-4.8 b/Library/Homebrew/shims/mac/super/gcc-4.8
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/gcc-4.8
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/gcc-4.9 b/Library/Homebrew/shims/mac/super/gcc-4.9
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/gcc-4.9
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/gcc-5 b/Library/Homebrew/shims/mac/super/gcc-5
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/gcc-5
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/gcc-6 b/Library/Homebrew/shims/mac/super/gcc-6
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/gcc-6
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/gcc-7 b/Library/Homebrew/shims/mac/super/gcc-7
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/gcc-7
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/git b/Library/Homebrew/shims/mac/super/git
new file mode 120000
index 0000000000..383ac245fa
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/git
@@ -0,0 +1 @@
+../../scm/git
\ No newline at end of file
diff --git a/Library/Homebrew/shims/super/gmake b/Library/Homebrew/shims/mac/super/gmake
similarity index 100%
rename from Library/Homebrew/shims/super/gmake
rename to Library/Homebrew/shims/mac/super/gmake
diff --git a/Library/Homebrew/shims/mac/super/i686-apple-darwin11-llvm-g++-4.2 b/Library/Homebrew/shims/mac/super/i686-apple-darwin11-llvm-g++-4.2
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/i686-apple-darwin11-llvm-g++-4.2
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/i686-apple-darwin11-llvm-gcc-4.2 b/Library/Homebrew/shims/mac/super/i686-apple-darwin11-llvm-gcc-4.2
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/i686-apple-darwin11-llvm-gcc-4.2
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/ld b/Library/Homebrew/shims/mac/super/ld
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/ld
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/llvm-g++ b/Library/Homebrew/shims/mac/super/llvm-g++
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/llvm-g++
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/llvm-g++-4.2 b/Library/Homebrew/shims/mac/super/llvm-g++-4.2
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/llvm-g++-4.2
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/llvm-gcc b/Library/Homebrew/shims/mac/super/llvm-gcc
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/llvm-gcc
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/llvm-gcc-4.2 b/Library/Homebrew/shims/mac/super/llvm-gcc-4.2
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/llvm-gcc-4.2
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/llvm_clang b/Library/Homebrew/shims/mac/super/llvm_clang
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/llvm_clang
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/mac/super/llvm_clang++ b/Library/Homebrew/shims/mac/super/llvm_clang++
new file mode 120000
index 0000000000..2652f5f42c
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/llvm_clang++
@@ -0,0 +1 @@
+cc
\ No newline at end of file
diff --git a/Library/Homebrew/shims/super/make b/Library/Homebrew/shims/mac/super/make
similarity index 100%
rename from Library/Homebrew/shims/super/make
rename to Library/Homebrew/shims/mac/super/make
diff --git a/Library/Homebrew/shims/super/mig b/Library/Homebrew/shims/mac/super/mig
similarity index 100%
rename from Library/Homebrew/shims/super/mig
rename to Library/Homebrew/shims/mac/super/mig
diff --git a/Library/Homebrew/shims/super/pod2man b/Library/Homebrew/shims/mac/super/pod2man
similarity index 100%
rename from Library/Homebrew/shims/super/pod2man
rename to Library/Homebrew/shims/mac/super/pod2man
diff --git a/Library/Homebrew/shims/super/sed b/Library/Homebrew/shims/mac/super/sed
similarity index 100%
rename from Library/Homebrew/shims/super/sed
rename to Library/Homebrew/shims/mac/super/sed
diff --git a/Library/Homebrew/shims/mac/super/svn b/Library/Homebrew/shims/mac/super/svn
new file mode 120000
index 0000000000..50a0b671ba
--- /dev/null
+++ b/Library/Homebrew/shims/mac/super/svn
@@ -0,0 +1 @@
+../../scm/svn
\ No newline at end of file
diff --git a/Library/Homebrew/shims/super/xcrun b/Library/Homebrew/shims/mac/super/xcrun
similarity index 100%
rename from Library/Homebrew/shims/super/xcrun
rename to Library/Homebrew/shims/mac/super/xcrun