diff --git a/prepare.sh b/prepare.sh
index bbe9b81c..142f4521 100755
--- a/prepare.sh
+++ b/prepare.sh
@@ -45,7 +45,7 @@ mkdir -p $ROOT/tmp
 # Clang is needed to compile for many platforms.
 wget -O tmp/llvm.sh https://apt.llvm.org/llvm.sh
 chmod +x tmp/llvm.sh
-sudo tmp/llvm.sh 15
+sudo tmp/llvm.sh 16
 
 # Install the programs and virtualenvs.
 
diff --git a/renpybuild/run.py b/renpybuild/run.py
index 5f40debb..0e3e54b6 100644
--- a/renpybuild/run.py
+++ b/renpybuild/run.py
@@ -37,7 +37,7 @@ def emsdk_environment(c):
         c.env(k, v)
 
 
-def llvm(c, bin="", prefix="", suffix="-15", clang_args="", use_ld=True):
+def llvm(c, bin="", prefix="", suffix="-16", clang_args="", use_ld=True):
 
     if bin and not bin.endswith("/"):
         bin += "/"
@@ -177,7 +177,7 @@ def build_environment(c):
     elif (c.platform == "ios") and (c.arch == "sim-x86_64"):
         c.env("IPHONEOS_DEPLOYMENT_TARGET", "13.0")
 
-    c.var("lipo", "llvm-lipo-15")
+    c.var("lipo", "llvm-lipo-16")
 
 
     if c.kind == "host" or c.kind == "host-python" or c.kind == "cross":
diff --git a/tasks/renios.py b/tasks/renios.py
index 1d97fb4f..b90cbd66 100644
--- a/tasks/renios.py
+++ b/tasks/renios.py
@@ -24,7 +24,7 @@ def check_sdk(name, paths):
     for d in paths:
         fn = d / name
 
-        p = subprocess.run([ "llvm-otool-15", "-l", f"{fn}"], capture_output=True)
+        p = subprocess.run([ "llvm-otool-16", "-l", f"{fn}"], capture_output=True)
 
         obj = None
 
diff --git a/tasks/toolchain.py b/tasks/toolchain.py
index bfee40f6..c2daf902 100644
--- a/tasks/toolchain.py
+++ b/tasks/toolchain.py
@@ -8,8 +8,8 @@
 @task(kind="cross", platforms="windows")
 def download(c: Context):
 
-    url = "https://github.com/mstorsjo/llvm-mingw/releases/download/20220906/llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64.tar.xz"
-    dest = c.path("{{ tmp }}/tars/llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64.tar.xz")
+    url = "https://github.com/mstorsjo/llvm-mingw/releases/download/20230614/llvm-mingw-20230614-ucrt-ubuntu-20.04-x86_64.tar.xz"
+    dest = c.path("{{ tmp }}/tars/llvm-mingw-20230614-ucrt-ubuntu-20.04-x86_64.tar.xz")
 
     if os.path.exists(dest):
         return
@@ -33,8 +33,8 @@ def unpack(c: Context):
     c.clean("{{cross}}")
     c.chdir("{{cross}}")
 
-    c.run("tar xaf {{ tmp }}/tars/llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64.tar.xz")
-    c.run("ln -s llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64 llvm-mingw")
+    c.run("tar xaf {{ tmp }}/tars/llvm-mingw-20230614-ucrt-ubuntu-20.04-x86_64.tar.xz")
+    c.run("ln -s llvm-mingw-20230614-ucrt-ubuntu-20.04-x86_64 llvm-mingw")
 
 
 @task(kind="cross", platforms="android", always=True)