diff --git a/Formula/llvm.rb b/Formula/llvm.rb
index c4ab475e8fe87..04f64c8d5237c 100644
--- a/Formula/llvm.rb
+++ b/Formula/llvm.rb
@@ -29,13 +29,13 @@ class Llvm < Formula
   env :std if build.universal?
 
   def install
-    if build.with? 'python' and build.include? 'disable-shared'
+    if python and build.include? 'disable-shared'
       raise 'The Python bindings need the shared library.'
     end
 
     Clang.new("clang").brew do
-      clang_dir.install Dir['*']
-    end if build.include? 'with-clang'
+      (buildpath/'tools/clang').install Dir['*']
+    end if build.with? 'clang'
 
     if build.universal?
       ENV['UNIVERSAL'] = '1'
@@ -68,18 +68,14 @@ def install
     # install llvm python bindings
     if python
       python.site_packages.install buildpath/'bindings/python/llvm'
+      python.site_packages.install buildpath/'tools/clang/bindings/python/clang' if build.with? 'clang'
     end
 
-    # Install clang tools and bindings
-    cd clang_dir do
-      (share/'clang/tools').install 'tools/scan-build', 'tools/scan-view'
-      python.site_packages.install 'bindings/python/clang' if python
-    end if build.include? 'with-clang'
-
     # Remove all binaries except llvm-config
-    Dir[bin/'*'].each do |exec_path|
-      rm_f exec_path unless File.basename(exec_path) == 'llvm-config'
-    end
+    rm_f Dir["#{bin}/*"] - Dir["#{bin}/llvm-config"]
+
+    # Remove all man pages
+    man.rmtree if build.with? 'clang'
   end
 
   def test
@@ -105,7 +101,4 @@ def caveats
     EOS
   end
 
-  def clang_dir
-    buildpath/'tools/clang'
-  end
 end