diff --git a/buildscript/build.cmd b/buildscript/build.cmd
index 9a8d186d..3102e3da 100644
--- a/buildscript/build.cmd
+++ b/buildscript/build.cmd
@@ -142,7 +142,6 @@
 @set branch=%mesaver:~0,4%
 @if EXIST mesapatched.ini GOTO build_mesa
 @if %prepfail%==1 GOTO build_dxtn
-@if "%branch%"=="17.2" git apply -v ..\mesa-dist-win\patches\scons-llvm5.patch
 @git apply -v ..\mesa-dist-win\patches\s3tc.patch
 @if NOT "%mesaver:~-5%"=="devel" git apply -v ..\mesa-dist-win\patches\scons3.patch
 @set mesapatched=1
diff --git a/buildscript/readme.md b/buildscript/readme.md
index cfc75112..dabca330 100644
--- a/buildscript/readme.md
+++ b/buildscript/readme.md
@@ -23,9 +23,7 @@ Extract in `.`. Be warned that the archive is double packed. Rename extracted fo
 You can use the portable version if you don't want to bloat your system too much, but you have to add it to PATH. Required due to Scons 3.0.0 support requiring a patch on Mesa code, now that Scons is always up-to-date.
 - [LLVM source code](http://llvm.org/);
 
-LLVM 5.0 is not yet supported. See [Mesa bug 102318](https://bugs.freedesktop.org/show_bug.cgi?id=102318). A patch is included in this repository in `patches/scons-llvm5.patch` for Mesa3D source code to make it work which requires git in order to apply. This build script will try to apply it automatically. To apply manually, browse in Command Prompt to Mesa3D source code, then use `git apply` command with the location of the patch file as parametter. 
-
-Extract LLVM code in `.`. Rename extracted folder to `llvm`. If you use Visual Studio 2017, LLVM 4.0 is the only version that supports it.
+Extract LLVM code in `.`. Rename extracted folder to `llvm`. If you use Visual Studio 2017, LLVM 4.0 is the minimum version that supports it.
 - [Ninja build system](https://github.com/ninja-build/ninja/releases)
 
 Optional, it reduces LLVM build size as it works with single configuration. Unlike Visual Studio MsBuild which require a Release and a Debug configuration at minimum. 
diff --git a/patches/scons-llvm5.patch b/patches/scons-llvm5.patch
deleted file mode 100644
index e1471315..00000000
--- a/patches/scons-llvm5.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/scons/llvm.py b/scons/llvm.py
-index 928fc97..eefb131 100644
---- a/scons/llvm.py
-+++ b/scons/llvm.py
-@@ -104,7 +104,27 @@ def generate(env):
-         ])
-         env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')])
-         # LIBS should match the output of `llvm-config --libs engine mcjit bitwriter x86asmprinter irreader`
--        if llvm_version >= distutils.version.LooseVersion('4.0'):
-+        if llvm_version >= distutils.version.LooseVersion('5.0'):
-+            env.Prepend(LIBS = [
-+                'LLVMX86Disassembler', 'LLVMX86AsmParser',
-+                'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter',
-+                'LLVMDebugInfoCodeView', 'LLVMCodeGen',
-+                'LLVMScalarOpts', 'LLVMInstCombine',
-+                'LLVMTransformUtils',
-+                'LLVMBitWriter', 'LLVMX86Desc',
-+                'LLVMMCDisassembler', 'LLVMX86Info',
-+                'LLVMX86AsmPrinter', 'LLVMX86Utils',
-+                'LLVMMCJIT', 'LLVMExecutionEngine', 'LLVMTarget',
-+                'LLVMAnalysis', 'LLVMProfileData',
-+                'LLVMRuntimeDyld', 'LLVMObject', 'LLVMMCParser',
-+                'LLVMBitReader', 'LLVMMC', 'LLVMCore',
-+                'LLVMSupport',
-+                'LLVMIRReader', 'LLVMAsmParser',
-+                'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF',
-+                'LLVMBinaryFormat',
-+            ])
-+
-+        elif llvm_version >= distutils.version.LooseVersion('4.0'):
-             env.Prepend(LIBS = [
-                 'LLVMX86Disassembler', 'LLVMX86AsmParser',
-                 'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter',
diff --git a/relnotes.md b/relnotes.md
index e36d28a7..ce8a0046 100644
--- a/relnotes.md
+++ b/relnotes.md
@@ -4,8 +4,6 @@
 - Add Scons 3.0.0 compatibility patch to Mesa3D Git-powered auto-patches.
 Only apply it to Mesa stable, patch is upstream now.
 - Determine Mesa branch even if it is not built. Preparation for S3TC merger.
-- Drop LLVM 5.0 compatibility patch when building Mesa master and version 17.1.10.
-Patch is upstream.
 - Ensure auto-patching is done once and only once.
 - Look for Git before trying to patch. It is pointless if it is not found.
 - This script won't find Scons if it isn't in a certain relative location to it.
@@ -13,6 +11,7 @@ Addressed this by fixing scons locating when Python it's in PATH right from the
 - Added Scons to python update checking and auto-install. Depends on wheel.
 1 less dependency requiring manual installation.
 - Halt execution if Mesa is missing and it can't be acquired or its acquiring is refused by user.
+- Drop LLVM 5.0 compatibility patch. Patch is upstream in all active branches.
 
 # Build script documentation
 - Compatibility fix for Scons 3.0.0.