diff --git a/bin/ruby-build b/bin/ruby-build
index b0bc3a84..bc1b0cea 100755
--- a/bin/ruby-build
+++ b/bin/ruby-build
@@ -872,7 +872,7 @@ require_llvm() {
         if [ -n "$llvm_config" ]; then
           package_option ruby configure --llvm-config="$llvm_config"
         else
-          local homebrew_package="llvm${llvm_version//.}"
+          local homebrew_package="llvm@$llvm_version"
           { echo
             colorize 1 "ERROR"
             echo ": Rubinius will not be able to compile using Apple's LLVM-based "
@@ -881,7 +881,7 @@ require_llvm() {
             colorize 1 "TO FIX THE PROBLEM"
             echo ": Install Homebrew's llvm package with this"
             echo -n "command: "
-            colorize 4 "brew tap homebrew/versions ; brew install $homebrew_package"
+            colorize 4 "brew install $homebrew_package"
             echo
           } >&3
           return 1
diff --git a/share/ruby-build/rbx-3.66 b/share/ruby-build/rbx-3.66
index c8edebd5..db83427c 100644
--- a/share/ruby-build/rbx-3.66
+++ b/share/ruby-build/rbx-3.66
@@ -1,3 +1,3 @@
-require_llvm 3.6
+require_llvm 3.7
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "rubinius-3.66" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-3.66.tar.bz2#4bb237a1da1d52bc830bbe704bd4b995bbc07e50b558e460aff54d6bc309975e" rbx
diff --git a/share/ruby-build/rbx-3.67 b/share/ruby-build/rbx-3.67
index 47c2f0ef..8823c66a 100644
--- a/share/ruby-build/rbx-3.67
+++ b/share/ruby-build/rbx-3.67
@@ -1,3 +1,3 @@
-require_llvm 3.6
+require_llvm 3.7
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "rubinius-3.67" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-3.67.tar.bz2#a5eedd6169f80df528ac73cf2ed9183e2f5a82a57ca0b2ae3962c26238427b87" rbx
diff --git a/share/ruby-build/rbx-3.68 b/share/ruby-build/rbx-3.68
index 780dfcff..ee5ba0e6 100644
--- a/share/ruby-build/rbx-3.68
+++ b/share/ruby-build/rbx-3.68
@@ -1,3 +1,3 @@
-require_llvm 3.6
+require_llvm 3.7
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "rubinius-3.68" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-3.68.tar.bz2#44f423a8557aa8fa383573638a94faaf3f9c587a771be267c60ed0c78784f567" rbx
diff --git a/share/ruby-build/rbx-3.69 b/share/ruby-build/rbx-3.69
index ba4cac00..0c42499d 100644
--- a/share/ruby-build/rbx-3.69
+++ b/share/ruby-build/rbx-3.69
@@ -1,3 +1,3 @@
-require_llvm 3.6
+require_llvm 3.7
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "rubinius-3.69" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-3.69.tar.bz2#2dcde5cb7ba1e1664f6bf902cd866d2564985536a0908caeac2e4099b6b255b2" rbx