diff --git a/debug/llvm-config.cmd b/debug/llvm-config.cmd
new file mode 100644
index 00000000..059aec8e
--- /dev/null
+++ b/debug/llvm-config.cmd
@@ -0,0 +1,17 @@
+@cd ../../llvm
+@if EXIST x64 (
+@cd x64
+@GOTO writedebugoutput
+)
+@if EXIST x86 (
+@cd x86
+@GOTO writedebugoutput
+)
+
+:writedebugoutput
+@cd bin
+@del "..\..\..\mesa-dist-win\debug\llvm-config.txt"
+@llvm-config --libs engine mcjit bitwriter x86asmprinter irreader > "..\..\..\mesa-dist-win\debug\llvm-config.txt"
+@echo LLVM config output updated
+@pause
+@exit
\ No newline at end of file
diff --git a/debug/llvm-config.txt b/debug/llvm-config.txt
index c05ec48b..035b5526 100644
--- a/debug/llvm-config.txt
+++ b/debug/llvm-config.txt
@@ -1,2 +1 @@
-C:\Software\Development\projects\mesa\llvm\x86\bin>llvm-config --libs engine mcjit bitwriter x86asmprinter irreader
-C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMIRReader.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMAsmParser.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMX86Disassembler.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMX86AsmParser.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMX86CodeGen.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMGlobalISel.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMSelectionDAG.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMAsmPrinter.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMDebugInfoCodeView.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMDebugInfoMSF.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMCodeGen.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMScalarOpts.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMInstCombine.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMTransformUtils.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMBitWriter.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMX86Desc.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMMCDisassembler.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMX86Info.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMX86AsmPrinter.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMX86Utils.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMMCJIT.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMExecutionEngine.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMTarget.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMAnalysis.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMProfileData.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMRuntimeDyld.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMObject.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMMCParser.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMBitReader.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMMC.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMCore.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMBinaryFormat.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMSupport.lib C:\Software\Development\projects\mesa\llvm\x86\lib\LLVMDemangle.lib
+C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMIRReader.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMAsmParser.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMX86Disassembler.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMX86AsmParser.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMX86CodeGen.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMGlobalISel.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMSelectionDAG.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMAsmPrinter.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMDebugInfoCodeView.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMDebugInfoMSF.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMCodeGen.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMScalarOpts.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMInstCombine.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMTransformUtils.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMBitWriter.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMX86Desc.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMMCDisassembler.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMX86Info.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMX86AsmPrinter.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMX86Utils.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMMCJIT.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMExecutionEngine.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMTarget.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMAnalysis.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMProfileData.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMRuntimeDyld.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMObject.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMMCParser.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMBitReader.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMMC.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMCore.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMBinaryFormat.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMSupport.lib C:\Software\Development\projects\mesa\llvm\x64\lib\LLVMDemangle.lib
diff --git a/relnotes.md b/relnotes.md
index 595ea485..bd6d7051 100644
--- a/relnotes.md
+++ b/relnotes.md
@@ -13,4 +13,4 @@
 - Drop S3TC standalone library support.
 - Drop swr 32-bit support. Unsupported upstream.
 ### Debugging
-- Add latest llvm-config output, valid for LLVM 5.0.x and 6.0 RC1. Allows for finding new LLVM libraries a lot easier using an online diff service like text-compare.com.
\ No newline at end of file
+- Add a script to generate LLVM config output. Allows for finding new LLVM libraries a lot easier using an online diff service like text-compare.com. Makes sending patches upstream easier.
\ No newline at end of file