diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake
index d707d360581..83b915874f1 100644
--- a/cmake/LLVM.cmake
+++ b/cmake/LLVM.cmake
@@ -60,7 +60,7 @@ function(fetch_or_build_slang_llvm)
             endif()
         endif()
     elseif(SLANG_SLANG_LLVM_FLAVOR STREQUAL "USE_SYSTEM_LLVM")
-        find_package(LLVM 13.0 REQUIRED CONFIG)
+        find_package(LLVM 17.0 REQUIRED CONFIG)
         find_package(Clang REQUIRED CONFIG)
 
         llvm_target_from_components(llvm-dep filecheck native orcjit)
@@ -104,7 +104,7 @@ function(fetch_or_build_slang_llvm)
         endif()
 
         # TODO: Put a check here that libslang-llvm.so doesn't have a 'NEEDED'
-        # directive for libLLVM-13.so, it's almost certainly going to break at
+        # directive for libLLVM-17.so, it's almost certainly going to break at
         # runtime in surprising ways when linked alongside Mesa (or anything else
         # pulling in libLLVM.so)
     endif()
diff --git a/docs/building.md b/docs/building.md
index b8a3429a3f2..537dc447599 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -219,7 +219,7 @@ There are several options for getting llvm-support:
       the case that a prebuilt binary can't be found then the build will proceed
       as though `DISABLE` was chosen
 - Use a system supplied LLVM: `-DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM`, you
-  must have llvm-13.0 and a matching libclang installed. It's important that
+  must have llvm-17.0 and a matching libclang installed. It's important that
   either:
     - You don't end up linking to a dynamic libllvm.so, this will almost
       certainly cause multiple versions of LLVM to be loaded at runtime,
diff --git a/external/build-llvm.ps1 b/external/build-llvm.ps1
index ff18ed12a3a..412fab76f06 100644
--- a/external/build-llvm.ps1
+++ b/external/build-llvm.ps1
@@ -55,7 +55,7 @@ $null = Register-EngineEvent PowerShell.Exiting -Action $cleanup
 
 # Default values
 $repo = "https://github.com/llvm/llvm-project"
-$branch = "llvmorg-13.0.1"
+$branch = "llvmorg-17.0.6"
 $sourceDir = $tempDir.FullName
 $installPrefix = ""
 $config = "Release"
diff --git a/external/build-llvm.sh b/external/build-llvm.sh
index 0575bf4bfb3..efd31cb334b 100755
--- a/external/build-llvm.sh
+++ b/external/build-llvm.sh
@@ -54,7 +54,7 @@ trap cleanup EXIT SIGHUP SIGINT SIGTERM
 # Options and parsing
 #
 repo=https://github.com/llvm/llvm-project
-branch=llvmorg-13.0.1
+branch=llvmorg-17.0.6
 source_dir=$temp_dir
 install_prefix=
 config=Release
diff --git a/source/slang-llvm/slang-llvm-filecheck.cpp b/source/slang-llvm/slang-llvm-filecheck.cpp
index 492b0e0d419..a7c8313d39a 100644
--- a/source/slang-llvm/slang-llvm-filecheck.cpp
+++ b/source/slang-llvm/slang-llvm-filecheck.cpp
@@ -8,6 +8,7 @@
 #include <core/slang-com-object.h>
 #include <llvm/ADT/SmallString.h>
 #include <llvm/FileCheck/FileCheck.h>
+#include <llvm/Support/SourceMgr.h>
 #include <llvm/Support/raw_ostream.h>
 #include <slang-test/filecheck.h>
 
diff --git a/source/slang-llvm/slang-llvm.cpp b/source/slang-llvm/slang-llvm.cpp
index 2860874b5e8..78f01005d1f 100644
--- a/source/slang-llvm/slang-llvm.cpp
+++ b/source/slang-llvm/slang-llvm.cpp
@@ -28,7 +28,6 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Process.h"
 #include "llvm/Support/Signals.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/Support/TimeProfiler.h"
 #include "llvm/Support/Timer.h"
@@ -231,7 +230,7 @@ void* LLVMJITSharedLibrary::findSymbolAddressByName(char const* name)
     if (fnExpected)
     {
         auto fn = std::move(*fnExpected);
-        return (void*)fn.getAddress();
+        return (void*)fn.getValue();
     }
     return nullptr;
 }
@@ -239,12 +238,12 @@ void* LLVMJITSharedLibrary::findSymbolAddressByName(char const* name)
 
 static void _ensureSufficientStack() {}
 
-static void _llvmErrorHandler(void* userData, const std::string& message, bool genCrashDiag)
+static void _llvmErrorHandler(void* userData, const char* message, bool genCrashDiag)
 {
     // DiagnosticsEngine& diags = *static_cast<DiagnosticsEngine*>(userData);
     // diags.Report(diag::err_fe_error_backend) << message;
 
-    printf("Clang/LLVM fatal error: %s\n", message.c_str());
+    printf("Clang/LLVM fatal error: %s\n", message);
 
     // Run the interrupt handlers to make sure any special cleanups get done, in
     // particular that we remove files registered with RemoveFileOnSignal.
@@ -785,9 +784,9 @@ SlangResult LLVMDownstreamCompiler::compile(
             includes.push_back(includePath.begin());
         }
 
-        clang::CompilerInvocation::setLangDefaults(
+        clang::LangOptions::setLangDefaults(
             *opts,
-            inputKind,
+            inputKind.getLanguage(),
             targetTriple,
             includes,
             langStd);
@@ -1049,7 +1048,9 @@ SlangResult LLVMDownstreamCompiler::compile(
                         {
                             symbolMap.insert(std::make_pair(
                                 mangler(func.name),
-                                JITEvaluatedSymbol::fromPointer(func.func)));
+                                ExecutorSymbolDef(
+                                    ExecutorAddr::fromPtr(func.func),
+                                    JITSymbolFlags::Exported)));
                         }
                     }