diff --git a/BUILD.md b/BUILD.md
index 1e44145..6cc4c2c 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -352,6 +352,7 @@ The minimum CMake requirements for building various components.
     3.3         ParaView-5.2.0
     3.3         ParaView-5.3.0
     3.4.3       llvm-3.9.1
+    3.4.3       llvm-4.0.0
     3.5         ParaView-5.1.0
 
 
@@ -384,8 +385,8 @@ The minimum gcc/g++ requirements for building various components.
 [link clang]:     http://llvm.org/releases/3.7.1/cfe-3.7.1.src.tar.xz
 [link llvm]:      http://llvm.org/releases/3.7.1/llvm-3.7.1.src.tar.xz
 
-[newer clang]:    http://llvm.org/releases/3.9.1/cfe-3.9.1.src.tar.xz
-[newer llvm]:     http://llvm.org/releases/3.9.1/llvm-3.9.1.src.tar.xz
+[newer clang]:    http://llvm.org/releases/4.0.0/cfe-4.0.0.src.tar.xz
+[newer llvm]:     http://llvm.org/releases/4.0.0/llvm-4.0.0.src.tar.xz
 
 
 <!-- parallel -->
diff --git a/makeLLVM b/makeLLVM
index 5da443f..102cce3 100755
--- a/makeLLVM
+++ b/makeLLVM
@@ -32,15 +32,15 @@
 #    - Ensure that you always use matching versions between llvm and clang.
 #    - LLVM components such as clang reside in the LLVM tools/ subdirectory
 #
-#    For example, when building from tar files (version 3.8.0)
+#    For example, when building from tar files (version 4.0.0)
 #
 #    1) Unpack LLVM:
-#        tar -xJvf llvm-3.8.0.src.tar.xz
-#        mv llvm-3.8.0.src  llvm-3.8.0
+#        tar -xJf llvm-4.0.0.src.tar.xz
+#        mv llvm-4.0.0.src  llvm-4.0.0
 #
 #    2) Unpack Clang (also know as cfe):
-#        tar -xJvf cfe-3.8.0.src.tar.xz
-#        mv cfe-3.8.0.src  llvm-3.8.0/tools/clang
+#        tar -xJf cfe-4.0.0.src.tar.xz
+#        mv cfe-4.0.0.src  llvm-4.0.0/tools/clang
 #
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
@@ -101,6 +101,9 @@ do
     llvm-[0-9]* | llvm-svn*)
         llvmPACKAGE="${1%%/}"
         ;;
+    [1-9]*)
+        llvmPACKAGE="llvm-${1%%/}"
+        ;;
     *)
         die "unknown option/argument: '$1'"
         ;;