diff --git a/clang-14.0.4.src.tar.xz b/clang-14.0.4.src.tar.xz
deleted file mode 100644
index 66c5611..0000000
--- a/clang-14.0.4.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:922bdc8341491d4f54548c51bafd77c0e737a3146fe33c762bce31a0fd151591
-size 18537140
diff --git a/clang-14.0.5.src.tar.xz b/clang-14.0.5.src.tar.xz
new file mode 100644
index 0000000..c8116dd
--- /dev/null
+++ b/clang-14.0.5.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8e2e3ce217f4c2682c3fe2d2691f826cf1f0ab0a1dff4b5b8f6264baa1f2a79
+size 18540588
diff --git a/clang-docs-14.0.4.src.tar.xz b/clang-docs-14.0.4.src.tar.xz
deleted file mode 100644
index f054799..0000000
--- a/clang-docs-14.0.4.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c993f5d31b764f677ea57700965886550577abe000bf8d35ea50daee7994ae3
-size 1413580
diff --git a/clang-docs-14.0.5.src.tar.xz b/clang-docs-14.0.5.src.tar.xz
new file mode 100644
index 0000000..3cc5b09
--- /dev/null
+++ b/clang-docs-14.0.5.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffc908179ee013be1f827591dcdabf93c721df77be0504ee4f7481ad746ec34e
+size 1413672
diff --git a/clang-tools-extra-14.0.4.src.tar.xz b/clang-tools-extra-14.0.4.src.tar.xz
deleted file mode 100644
index 538dab3..0000000
--- a/clang-tools-extra-14.0.4.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8bacb565da90bd1eb76ac267a70a4287e238680c48f7bd00f0a890ce0ae8fed
-size 2849200
diff --git a/clang-tools-extra-14.0.5.src.tar.xz b/clang-tools-extra-14.0.5.src.tar.xz
new file mode 100644
index 0000000..8ec8aaa
--- /dev/null
+++ b/clang-tools-extra-14.0.5.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:443d7d3dc1e2a39e36b4a99989065e0328da788e4df96fd359d60fce962b3edd
+size 2849700
diff --git a/compiler-rt-14.0.4.src.tar.xz b/compiler-rt-14.0.4.src.tar.xz
deleted file mode 100644
index 546c16f..0000000
--- a/compiler-rt-14.0.4.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02cbb6ca3ae3ebfb77245de0866faff886b16c48a806cd2ae32ac6ccbba8285b
-size 2327868
diff --git a/compiler-rt-14.0.5.src.tar.xz b/compiler-rt-14.0.5.src.tar.xz
new file mode 100644
index 0000000..4443e1c
--- /dev/null
+++ b/compiler-rt-14.0.5.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5235e48331a658df40f99dd1baca93b9622b917e62dc5e328883078ff8d23ca2
+size 2329224
diff --git a/libcxx-14.0.4.src.tar.xz b/libcxx-14.0.4.src.tar.xz
deleted file mode 100644
index f1da7a4..0000000
--- a/libcxx-14.0.4.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9aad37282b0086b09b6d5489630dc8399577d64674071ae6e4ecf340c7e058be
-size 3066664
diff --git a/libcxx-14.0.5.src.tar.xz b/libcxx-14.0.5.src.tar.xz
new file mode 100644
index 0000000..a39e5e7
--- /dev/null
+++ b/libcxx-14.0.5.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d4468606dda61620186bc9cce6424e8a07946ff61178d7480680018179bb329
+size 3064564
diff --git a/libcxxabi-14.0.4.src.tar.xz b/libcxxabi-14.0.4.src.tar.xz
deleted file mode 100644
index 47360f5..0000000
--- a/libcxxabi-14.0.4.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f526943c9b70836364f90d42ca4fa3f90505d02b5d8fa739937cc7b79c0580ac
-size 561788
diff --git a/libcxxabi-14.0.5.src.tar.xz b/libcxxabi-14.0.5.src.tar.xz
new file mode 100644
index 0000000..0c4063c
--- /dev/null
+++ b/libcxxabi-14.0.5.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4673ddd883e7b24f0aacbd0ed43fa2510e4c86e2ed3cbd91d20cf1f76e5a1bff
+size 561856
diff --git a/lld-14.0.4.src.tar.xz b/lld-14.0.4.src.tar.xz
deleted file mode 100644
index a9ce1aa..0000000
--- a/lld-14.0.4.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:05e1284a65166d0a3a1139b9993f1c632b82930501316ae20c88a204170c2ba6
-size 1366056
diff --git a/lld-14.0.5.src.tar.xz b/lld-14.0.5.src.tar.xz
new file mode 100644
index 0000000..859226e
--- /dev/null
+++ b/lld-14.0.5.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8aa7be03500a37d8a1ff838f27c801648e2cb41828e7a8bc436d8d6e404224d8
+size 1366116
diff --git a/lldb-14.0.4.src.tar.xz b/lldb-14.0.4.src.tar.xz
deleted file mode 100644
index e158210..0000000
--- a/lldb-14.0.4.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9301073df20728a8a64aca8d741465264b999649996009c2c30ba7a705459ff0
-size 10088328
diff --git a/lldb-14.0.5.src.tar.xz b/lldb-14.0.5.src.tar.xz
new file mode 100644
index 0000000..ef75881
--- /dev/null
+++ b/lldb-14.0.5.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:300084fc8295fac317620b4b9efab3f237891b231158522d136a5e91fbd78919
+size 10088700
diff --git a/llvm-14.0.4.src.tar.xz b/llvm-14.0.4.src.tar.xz
deleted file mode 100644
index 44175a6..0000000
--- a/llvm-14.0.4.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb8e90dfadae4073a7f8fc6384bacc0dda072400d82b9d25dabb5280a737ba22
-size 49656144
diff --git a/llvm-14.0.5.src.tar.xz b/llvm-14.0.5.src.tar.xz
new file mode 100644
index 0000000..7ad636f
--- /dev/null
+++ b/llvm-14.0.5.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:234c8ed02ed1338aa4f0ffa955e45eb13abe7ba0032569d6bc17ae9334257b02
+size 49662028
diff --git a/llvm-do-not-install-static-libraries.patch b/llvm-do-not-install-static-libraries.patch
index 5bfa006..315cb1c 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-14.0.4.src/cmake/modules/AddClang.cmake
+Index: clang-14.0.5.src/cmake/modules/AddClang.cmake
 ===================================================================
---- a/clang-14.0.4.src/cmake/modules/AddClang.cmake
-+++ b/clang-14.0.4.src/cmake/modules/AddClang.cmake
+--- a/clang-14.0.5.src/cmake/modules/AddClang.cmake
++++ b/clang-14.0.5.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-14.0.4.src/cmake/modules/AddLLD.cmake
+Index: lld-14.0.5.src/cmake/modules/AddLLD.cmake
 ===================================================================
---- a/lld-14.0.4.src/cmake/modules/AddLLD.cmake
-+++ b/lld-14.0.4.src/cmake/modules/AddLLD.cmake
+--- a/lld-14.0.5.src/cmake/modules/AddLLD.cmake
++++ b/lld-14.0.5.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-14.0.4.src/cmake/modules/AddLLD.cmake
      if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)
        add_llvm_install_targets(install-${name}
          DEPENDS ${name}
-Index: polly-14.0.4.src/cmake/polly_macros.cmake
+Index: polly-14.0.5.src/cmake/polly_macros.cmake
 ===================================================================
---- a/polly-14.0.4.src/cmake/polly_macros.cmake
-+++ b/polly-14.0.4.src/cmake/polly_macros.cmake
+--- a/polly-14.0.5.src/cmake/polly_macros.cmake
++++ b/polly-14.0.5.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-14.0.4.src/cmake/polly_macros.cmake
  endmacro(add_polly_library)
  
  macro(add_polly_loadable_module name)
-Index: polly-14.0.4.src/lib/CMakeLists.txt
+Index: polly-14.0.5.src/lib/CMakeLists.txt
 ===================================================================
---- a/polly-14.0.4.src/lib/CMakeLists.txt
-+++ b/polly-14.0.4.src/lib/CMakeLists.txt
+--- a/polly-14.0.5.src/lib/CMakeLists.txt
++++ b/polly-14.0.5.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-14.0.4.src.tar.xz b/llvm-docs-14.0.4.src.tar.xz
deleted file mode 100644
index 010044f..0000000
--- a/llvm-docs-14.0.4.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e56dbb0ca5395222d0a6b9b4803340f95fc6aa3ee6c9de23ce9224ca3f159bcd
-size 6601068
diff --git a/llvm-docs-14.0.5.src.tar.xz b/llvm-docs-14.0.5.src.tar.xz
new file mode 100644
index 0000000..ed4688c
--- /dev/null
+++ b/llvm-docs-14.0.5.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08668a33d57e1a26490749f6bad4c6899c594f2f56941014b925f04fe4b2a71a
+size 6601172
diff --git a/llvm14.changes b/llvm14.changes
index 4370af0..1ebcaa0 100644
--- a/llvm14.changes
+++ b/llvm14.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jun 16 16:44:07 UTC 2022 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Update to version 14.0.5.
+  * This release contains bug-fixes for the LLVM 14.0.0 release.
+    This release is API and ABI compatible with 14.0.0.
+- Rebase llvm-do-not-install-static-libraries.patch.
+
 -------------------------------------------------------------------
 Sat May 28 12:42:06 UTC 2022 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 
diff --git a/llvm14.spec b/llvm14.spec
index 7d220a8..0dddfa1 100644
--- a/llvm14.spec
+++ b/llvm14.spec
@@ -16,14 +16,14 @@
 #
 
 
-%define _relver 14.0.4
+%define _relver 14.0.5
 %define _version %_relver%{?_rc:rc%_rc}
 %define _tagver %_relver%{?_rc:-rc%_rc}
 %define _minor  14.0
 %define _sonum  14
 %define _itsme14 1
 # Integer version used by update-alternatives
-%define _uaver  1404
+%define _uaver  1405
 %define _soclang 13
 %define _socxx  1
 
@@ -81,6 +81,20 @@
 %endif
 %define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}-%{host_runtime}
 
+# By default, build everything.
+%global llvm_targets "all"
+%global llvm_experimental_targets "M68k"
+%ifarch %arm ppc64 ppc64le
+# No cross-compilation, but GPU targets.
+%global llvm_targets "host;AMDGPU;BPF;NVPTX"
+%global llvm_experimental_targets ""
+%endif
+%ifarch ppc s390x
+# No graphics cards on System Z; turned off for ppc because of relocation overflows.
+%global llvm_targets "host;BPF"
+%global llvm_experimental_targets ""
+%endif
+
 %define _plv %{!?product_libs_llvm_ver:%{_sonum}}%{?product_libs_llvm_ver}
 
 # Expands to -n if we're providing the distribution default for the given package.
@@ -672,30 +686,6 @@ mv libcxxabi-%{_version}.src projects/libcxxabi
 CFLAGS="%flags"
 CXXFLAGS="%flags"
 
-# By default build everything
-TARGETS_TO_BUILD="all"
-EXPERIMENTAL_TARGETS_TO_BUILD="M68k"
-%ifarch s390 s390x
-# No graphics cards on System z
-TARGETS_TO_BUILD="host;BPF"
-EXPERIMENTAL_TARGETS_TO_BUILD=
-%endif
-%ifarch %arm
-# TODO: Document why those.
-TARGETS_TO_BUILD="host;ARM;AMDGPU;BPF;NVPTX"
-EXPERIMENTAL_TARGETS_TO_BUILD=
-%endif
-%ifarch ppc64 ppc64le
-# TODO: Document why those.
-TARGETS_TO_BUILD="host;AMDGPU;BPF;NVPTX"
-EXPERIMENTAL_TARGETS_TO_BUILD=
-%endif
-%ifarch ppc
-# TODO: Graphics cards turned off because of relocation overflows.
-TARGETS_TO_BUILD="host;BPF"
-EXPERIMENTAL_TARGETS_TO_BUILD=
-%endif
-
 mem_per_compile_job=1200000
 %ifarch i586 ppc armv6hl armv7hl
 # 32-bit arches need less memory than 64-bit arches.
@@ -818,8 +808,8 @@ export LD_LIBRARY_PATH=%{sourcedir}/build/%{_lib}
     -DLLVM_ENABLE_ASSERTIONS=OFF \
     -DLLVM_ENABLE_PIC=ON \
     -DLLVM_BINUTILS_INCDIR=%{_includedir} \
-    -DLLVM_TARGETS_TO_BUILD=${TARGETS_TO_BUILD} \
-    -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=${EXPERIMENTAL_TARGETS_TO_BUILD} \
+    -DLLVM_TARGETS_TO_BUILD=%{llvm_targets} \
+    -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=%{llvm_experimental_targets} \
     -DLLVM_TOOL_LLVM_EXEGESIS_BUILD:BOOL=OFF \
     -DLLVM_INCLUDE_BENCHMARKS:BOOL=OFF \
     -DCOMPILER_RT_USE_LIBCXX:BOOL=OFF \
diff --git a/openmp-14.0.4.src.tar.xz b/openmp-14.0.4.src.tar.xz
deleted file mode 100644
index 34fee50..0000000
--- a/openmp-14.0.4.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4b627e2668c3c1001b6c772297273dc67b42f2deec934a59650a55731f8d411
-size 1205512
diff --git a/openmp-14.0.5.src.tar.xz b/openmp-14.0.5.src.tar.xz
new file mode 100644
index 0000000..4a87474
--- /dev/null
+++ b/openmp-14.0.5.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f74ede110ce1e2dc02fc163b04c4ce20dd49351407426e53292adbd4af6fdab
+size 1205528
diff --git a/polly-14.0.4.src.tar.xz b/polly-14.0.4.src.tar.xz
deleted file mode 100644
index 3f4258e..0000000
--- a/polly-14.0.4.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c1c28aeccc10fe3e7c71d0f756d3c36e0019b7236bbbeb2d93ee702557d52215
-size 9357472
diff --git a/polly-14.0.5.src.tar.xz b/polly-14.0.5.src.tar.xz
new file mode 100644
index 0000000..6f49a6c
--- /dev/null
+++ b/polly-14.0.5.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f97adf9281eb670d419b5f8dd6959aad9c65f728369269cee17494152a92f6d0
+size 9359768