diff --git a/clang-15.0.0.src.tar.xz b/clang-15.0.0.src.tar.xz
deleted file mode 100644
index 8d8bdf2..0000000
--- a/clang-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d29689aea6c2f882618442c74fc89a8f131dbb1cc318921fa962a82c9f70ff65
-size 18836592
diff --git a/clang-15.0.1.src.tar.xz b/clang-15.0.1.src.tar.xz
new file mode 100644
index 0000000..22694ac
--- /dev/null
+++ b/clang-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76f8bee6cf97daf7e553936f66195df917c99d58944113aa3f7ee8d9eb80051d
+size 18835596
diff --git a/clang-docs-15.0.0.src.tar.xz b/clang-docs-15.0.0.src.tar.xz
deleted file mode 100644
index cb69089..0000000
--- a/clang-docs-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:682cee75ea5d20a30f7c699a8f278bf5c8a059bcbd0bf6cf4dd127332099bdd9
-size 1506436
diff --git a/clang-docs-15.0.1.src.tar.xz b/clang-docs-15.0.1.src.tar.xz
new file mode 100644
index 0000000..752bf13
--- /dev/null
+++ b/clang-docs-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:128f1e131ddc7e6621624dee39171f5895729003d54bdc275727b92619d1097c
+size 1506668
diff --git a/clang-test-xfail-gnuless-triple.patch b/clang-test-xfail-gnuless-triple.patch
new file mode 100644
index 0000000..e5a74b1
--- /dev/null
+++ b/clang-test-xfail-gnuless-triple.patch
@@ -0,0 +1,10 @@
+diff --git a/clang/test/Driver/XRay/xray-instrument-os.c b/clang/test/Driver/XRay/xray-instrument-os.c
+index 3a0397208326..5cf7e35fdbf3 100644
+--- a/clang/test/Driver/XRay/xray-instrument-os.c
++++ b/clang/test/Driver/XRay/xray-instrument-os.c
+@@ -1,4 +1,4 @@
+ // RUN: not %clang -o /dev/null -v -fxray-instrument -c %s
+-// XFAIL: -linux-, -freebsd, x86_64-apple-darwin, x86_64-apple-macos
++// XFAIL: linux, freebsd, x86_64-apple-darwin, x86_64-apple-macos
+ // REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64
+ typedef int a;
diff --git a/clang-tools-extra-15.0.0.src.tar.xz b/clang-tools-extra-15.0.0.src.tar.xz
deleted file mode 100644
index 7ba3a19..0000000
--- a/clang-tools-extra-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0905b2dde93d07376081ee65e3b86ce7193210e0ac20d67c58c69ce933f0944
-size 3079396
diff --git a/clang-tools-extra-15.0.1.src.tar.xz b/clang-tools-extra-15.0.1.src.tar.xz
new file mode 100644
index 0000000..6408222
--- /dev/null
+++ b/clang-tools-extra-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c36b081071700e9e3e6846ce31bf2670e39c60cece77da6756fbb538fc50a2ea
+size 3079676
diff --git a/cmake-15.0.0.src.tar.xz b/cmake-15.0.0.src.tar.xz
deleted file mode 100644
index 571da68..0000000
--- a/cmake-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a3096c6d00f8d2fc588243db1b6a8c283a31e28a02f7e4c435a9a27ccf88e8f
-size 6980
diff --git a/cmake-15.0.1.src.tar.xz b/cmake-15.0.1.src.tar.xz
new file mode 100644
index 0000000..d81ad86
--- /dev/null
+++ b/cmake-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a660d1b7d4d2ef9759de6ad360d5fa9eed3625a6548068a97df2dd706edf2dd0
+size 6976
diff --git a/compiler-rt-15.0.0.src.tar.xz b/compiler-rt-15.0.0.src.tar.xz
deleted file mode 100644
index 49cc1d1..0000000
--- a/compiler-rt-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9111ca0407d9e32ecf4aff4f85d9ee300e0179ab64ba7ab6db4e49b0a8a2ea3d
-size 2350836
diff --git a/compiler-rt-15.0.1.src.tar.xz b/compiler-rt-15.0.1.src.tar.xz
new file mode 100644
index 0000000..162ac03
--- /dev/null
+++ b/compiler-rt-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af9f1c2be8596bb76f712c29c77e2c18cfa7d0f94dbca5d396d757342ece2e1b
+size 2351060
diff --git a/libcxx-15.0.0.src.tar.xz b/libcxx-15.0.0.src.tar.xz
deleted file mode 100644
index 885bbd3..0000000
--- a/libcxx-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d448b21c8994dd9f373b884651df30c367646f773c046f0538c571c95ed46b6e
-size 3343716
diff --git a/libcxx-15.0.1.src.tar.xz b/libcxx-15.0.1.src.tar.xz
new file mode 100644
index 0000000..018f56c
--- /dev/null
+++ b/libcxx-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae38506da0835b4df03444293a42a83224aecc694891fc4d18fba0758cb3c1fc
+size 3345100
diff --git a/libcxxabi-15.0.0.src.tar.xz b/libcxxabi-15.0.0.src.tar.xz
deleted file mode 100644
index f186257..0000000
--- a/libcxxabi-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d07c5cf5ced4204ea607e0e0c062d7e12da70c438e94d57a491b749975f381eb
-size 568640
diff --git a/libcxxabi-15.0.1.src.tar.xz b/libcxxabi-15.0.1.src.tar.xz
new file mode 100644
index 0000000..ec0aa54
--- /dev/null
+++ b/libcxxabi-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9573d41962d5896e2ad613ff82c4524bcd193bb4d170e2a369e864f393f3e53
+size 568756
diff --git a/lld-15.0.0.src.tar.xz b/lld-15.0.0.src.tar.xz
deleted file mode 100644
index e264343..0000000
--- a/lld-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79a5ca7e1ddf226720fae6ea83da027e365fcd91d333c87c8dc31860c8c3735a
-size 1404968
diff --git a/lld-15.0.1.src.tar.xz b/lld-15.0.1.src.tar.xz
new file mode 100644
index 0000000..94e8d5a
--- /dev/null
+++ b/lld-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4966ce882c147452b607a2a7320d5e3400b6d1f27543009bea5445aeb64d3728
+size 1406632
diff --git a/lldb-15.0.0.src.tar.xz b/lldb-15.0.0.src.tar.xz
deleted file mode 100644
index 6401df6..0000000
--- a/lldb-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1086b5fae04472a006e1be620bba851ee17b9722cd2cf2ce5b557fc9d9699f11
-size 10298372
diff --git a/lldb-15.0.1.src.tar.xz b/lldb-15.0.1.src.tar.xz
new file mode 100644
index 0000000..f0ffc5b
--- /dev/null
+++ b/lldb-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0393567db6139d9c0f8889b8230491fb4883d7e4753b1dfa79655f148aa230e6
+size 10298884
diff --git a/llvm-15.0.0.src.tar.xz b/llvm-15.0.0.src.tar.xz
deleted file mode 100644
index 20d0b3a..0000000
--- a/llvm-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4cd035b665f3be72382b978543d897238c7faa13d13cdd7d573c2e93f23c10d0
-size 53513368
diff --git a/llvm-15.0.1.src.tar.xz b/llvm-15.0.1.src.tar.xz
new file mode 100644
index 0000000..47224fd
--- /dev/null
+++ b/llvm-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0222beed0080fd07f1ee93c5bbeb2e05420b555b9cda725e3a0c299d8cea7cfa
+size 53522984
diff --git a/llvm-do-not-install-static-libraries.patch b/llvm-do-not-install-static-libraries.patch
index 5a2b144..49dde3e 100644
--- a/llvm-do-not-install-static-libraries.patch
+++ b/llvm-do-not-install-static-libraries.patch
@@ -2,10 +2,10 @@ This has similar effect as simply deleting the static libraries which we don't
 want after installation. By not copying them in the first place we reduce the
 disk usage during installation.
 
-Index: clang-15.0.0.src/cmake/modules/AddClang.cmake
+Index: clang-15.0.1.src/cmake/modules/AddClang.cmake
 ===================================================================
---- a/clang-15.0.0.src/cmake/modules/AddClang.cmake
-+++ b/clang-15.0.0.src/cmake/modules/AddClang.cmake
+--- a/clang-15.0.1.src/cmake/modules/AddClang.cmake
++++ b/clang-15.0.1.src/cmake/modules/AddClang.cmake
 @@ -106,12 +106,15 @@ macro(add_clang_library name)
  
        if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ARG_INSTALL_WITH_TOOLCHAIN)
@@ -68,10 +68,10 @@ Index: cmake/modules/AddLLVM.cmake
    endif()
    if (ARG_MODULE)
      set_target_properties(${name} PROPERTIES FOLDER "Loadable modules")
-Index: lld-15.0.0.src/cmake/modules/AddLLD.cmake
+Index: lld-15.0.1.src/cmake/modules/AddLLD.cmake
 ===================================================================
---- a/lld-15.0.0.src/cmake/modules/AddLLD.cmake
-+++ b/lld-15.0.0.src/cmake/modules/AddLLD.cmake
+--- a/lld-15.0.1.src/cmake/modules/AddLLD.cmake
++++ b/lld-15.0.1.src/cmake/modules/AddLLD.cmake
 @@ -17,13 +17,6 @@ macro(add_lld_library name)
  
    if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
@@ -86,10 +86,10 @@ Index: lld-15.0.0.src/cmake/modules/AddLLD.cmake
      if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)
        add_llvm_install_targets(install-${name}
          DEPENDS ${name}
-Index: polly-15.0.0.src/cmake/polly_macros.cmake
+Index: polly-15.0.1.src/cmake/polly_macros.cmake
 ===================================================================
---- a/polly-15.0.0.src/cmake/polly_macros.cmake
-+++ b/polly-15.0.0.src/cmake/polly_macros.cmake
+--- a/polly-15.0.1.src/cmake/polly_macros.cmake
++++ b/polly-15.0.1.src/cmake/polly_macros.cmake
 @@ -42,12 +42,14 @@ macro(add_polly_library name)
      llvm_config(${name} ${LLVM_LINK_COMPONENTS})
    endif( LLVM_LINK_COMPONENTS )
@@ -110,10 +110,10 @@ Index: polly-15.0.0.src/cmake/polly_macros.cmake
  endmacro(add_polly_library)
  
  macro(add_polly_loadable_module name)
-Index: polly-15.0.0.src/lib/CMakeLists.txt
+Index: polly-15.0.1.src/lib/CMakeLists.txt
 ===================================================================
---- a/polly-15.0.0.src/lib/CMakeLists.txt
-+++ b/polly-15.0.0.src/lib/CMakeLists.txt
+--- a/polly-15.0.1.src/lib/CMakeLists.txt
++++ b/polly-15.0.1.src/lib/CMakeLists.txt
 @@ -74,7 +74,7 @@ set_target_properties(PollyCore PROPERTI
  # It depends on all library it needs, such that with
  # LLVM_POLLY_LINK_INTO_TOOLS=ON, its dependencies like PollyISL are linked as
diff --git a/llvm-docs-15.0.0.src.tar.xz b/llvm-docs-15.0.0.src.tar.xz
deleted file mode 100644
index 8e6fdfa..0000000
--- a/llvm-docs-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:136eff81b0bd5abd34548caac2219d6d709d4e57cd719fff061ff9f09868c105
-size 6776984
diff --git a/llvm-docs-15.0.1.src.tar.xz b/llvm-docs-15.0.1.src.tar.xz
new file mode 100644
index 0000000..2c97f45
--- /dev/null
+++ b/llvm-docs-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38a184a638841bd7cae0db59c2e463a7495852f0fee7a6f0f10afc7714e0f61c
+size 6777508
diff --git a/llvm15.changes b/llvm15.changes
index a36c89a..5c78da2 100644
--- a/llvm15.changes
+++ b/llvm15.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Sep 22 12:19:07 UTC 2022 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Update to version 15.0.1.
+  * This release contains bug-fixes for the LLVM 15.0.1 release.
+    This release is API and ABI compatible with 15.0.0.
+- Rebase llvm-do-not-install-static-libraries.patch.
+
+-------------------------------------------------------------------
+Wed Sep 21 21:21:19 UTC 2022 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Always drop -gnu from triple for consistency. Patch a test that
+  was looking for -linux- in clang-test-xfail-gnuless-triple.patch.
+
 -------------------------------------------------------------------
 Mon Sep 12 07:29:54 UTC 2022 - Andreas Schwab <schwab@suse.de>
 
diff --git a/llvm15.spec b/llvm15.spec
index 15be944..9fd1edf 100644
--- a/llvm15.spec
+++ b/llvm15.spec
@@ -16,14 +16,14 @@
 #
 
 
-%define _relver 15.0.0
+%define _relver 15.0.1
 %define _version %_relver%{?_rc:rc%_rc}
 %define _tagver %_relver%{?_rc:-rc%_rc}
 %define _minor  15.0
 %define _sonum  15
 %define _itsme15 1
 # Integer version used by update-alternatives
-%define _uaver  1500
+%define _uaver  1501
 %define _soclang 13
 %define _socxx  1
 
@@ -75,15 +75,9 @@
 %endif
 
 %ifarch %{arm}
-%define host_runtime gnueabihf
+%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}-gnueabihf
 %else
-%define host_runtime gnu
-%endif
-%ifarch riscv64
-# This must match the gcc target exactly
 %define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}
-%else
-%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}-%{host_runtime}
 %endif
 
 # By default, build everything.
@@ -388,6 +382,8 @@ Patch33:        CMake-Look-up-target-subcomponents-in-LLVM_AVAILABLE_LIBS.patch
 Patch34:        llvm-link-atomic.patch
 # _Unwind_Exception is sometimes just an alias, not a struct. Fixes test on armv7l. (https://reviews.llvm.org/D132873)
 Patch35:        libcxxabi-fix-armv7-test.patch
+# Let test match for linux instead of -linux-.
+Patch36:        clang-test-xfail-gnuless-triple.patch
 BuildRequires:  binutils-devel >= 2.21.90
 BuildRequires:  cmake >= 3.13.4
 BuildRequires:  fdupes
@@ -823,6 +819,7 @@ pushd clang-%{_version}.src
 %patch4 -p1
 %patch6 -p1
 %patch9 -p2
+%patch36 -p2
 
 # We hardcode openSUSE
 rm unittests/Driver/DistroTest.cpp
diff --git a/openmp-15.0.0.src.tar.xz b/openmp-15.0.0.src.tar.xz
deleted file mode 100644
index 8a53915..0000000
--- a/openmp-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ee0d1c6a0426a34f102aa5c3a2c307807a4885ce347cb51fbc7e5effd6891c6
-size 1184764
diff --git a/openmp-15.0.1.src.tar.xz b/openmp-15.0.1.src.tar.xz
new file mode 100644
index 0000000..0eda589
--- /dev/null
+++ b/openmp-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d72ba3d777fca3c3b8923fa595d5a3c7d31ae5a5411e3f1d810a7c5398544f0e
+size 1184792
diff --git a/polly-15.0.0.src.tar.xz b/polly-15.0.0.src.tar.xz
deleted file mode 100644
index 2424176..0000000
--- a/polly-15.0.0.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ea79e690615475a87beb5fb99c7b7aea89dc7914cc575c3a1950da623247f44
-size 9354880
diff --git a/polly-15.0.1.src.tar.xz b/polly-15.0.1.src.tar.xz
new file mode 100644
index 0000000..3cb024d
--- /dev/null
+++ b/polly-15.0.1.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62d55d9da7ba1f4cbdf2f7b1557746c66af7d7c2aa4a15e0b2b7298b7dff0943
+size 9362236