diff --git a/bucket/llvm.json b/bucket/llvm.json
index 4edb3bf72b..5680b893e8 100644
--- a/bucket/llvm.json
+++ b/bucket/llvm.json
@@ -1,6 +1,7 @@
 {
-    "homepage": "https://www.llvm.org/",
     "version": "8.0.0",
+    "description": "Collection of modular and reusable compiler and toolchain technologies.",
+    "homepage": "https://www.llvm.org/",
     "license": "NCSA",
     "architecture": {
         "32bit": {
@@ -12,7 +13,47 @@
             "hash": "56d582eed2d5def6accaedabbe11ae368186600798e2a6a7eb86a727fa7bb20c"
         }
     },
-    "env_add_path": "bin",
+    "pre_install": "Remove-Item \"$dir\\`$*\" -Recurse",
+    "bin": [
+        "bin\\clang++.exe",
+        "bin\\clang-apply-replacements.exe",
+        "bin\\clang-change-namespace.exe",
+        "bin\\clang-check.exe",
+        "bin\\clang-cl.exe",
+        "bin\\clang-cpp.exe",
+        "bin\\clang-extdef-mapping.exe",
+        "bin\\clang-format.exe",
+        "bin\\clang-import-test.exe",
+        "bin\\clang-include-fixer.exe",
+        "bin\\clang-offload-bundler.exe",
+        "bin\\clang-query.exe",
+        "bin\\clang-refactor.exe",
+        "bin\\clang-rename.exe",
+        "bin\\clang-reorder-fields.exe",
+        "bin\\clang-tidy.exe",
+        "bin\\clang.exe",
+        "bin\\clangd.exe",
+        "bin\\find-all-symbols.exe",
+        "bin\\git-clang-format",
+        "bin\\hmaptool",
+        "bin\\ld.lld.exe",
+        "bin\\ld64.lld.exe",
+        "bin\\lld-link.exe",
+        "bin\\lld.exe",
+        "bin\\lldb-argdumper.exe",
+        "bin\\lldb-mi.exe",
+        "bin\\lldb-test.exe",
+        "bin\\lldb-vscode.exe",
+        "bin\\lldb.exe",
+        "bin\\llvm-ar.exe",
+        "bin\\llvm-lib.exe",
+        "bin\\llvm-objdump.exe",
+        "bin\\llvm-ranlib.exe",
+        "bin\\llvm-rc.exe",
+        "bin\\modularize.exe",
+        "bin\\scan-build.bat",
+        "bin\\wasm-ld.exe"
+    ],
     "checkver": "\\/releases\\/download.html#([\\d.]+)",
     "autoupdate": {
         "architecture": {