diff --git a/clang-16.0.1.src.tar.xz b/clang-16.0.1.src.tar.xz
deleted file mode 100644
index 43ca697..0000000
--- a/clang-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20cb1413846d75a5f57c7209f441801b63df38360142d98bf2b3dd3865301a91
-size 20355152
diff --git a/clang-16.0.1.src.tar.xz.sig b/clang-16.0.1.src.tar.xz.sig
deleted file mode 100644
index b12082e..0000000
Binary files a/clang-16.0.1.src.tar.xz.sig and /dev/null differ
diff --git a/clang-16.0.2.src.tar.xz b/clang-16.0.2.src.tar.xz
new file mode 100644
index 0000000..0ef4387
--- /dev/null
+++ b/clang-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e23a207307336ef217e6f55c4501f9b9bd7b8bd80f6dce7148f2a9c028da0fc
+size 20354708
diff --git a/clang-16.0.2.src.tar.xz.sig b/clang-16.0.2.src.tar.xz.sig
new file mode 100644
index 0000000..e55435e
Binary files /dev/null and b/clang-16.0.2.src.tar.xz.sig differ
diff --git a/clang-docs-16.0.1.src.tar.xz b/clang-docs-16.0.1.src.tar.xz
deleted file mode 100644
index 8cc82b6..0000000
--- a/clang-docs-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1cc95e693f8ad8b104b0b1dcf01c5731ad1b391e62d58efa0c2208315c5382f
-size 1551684
diff --git a/clang-docs-16.0.2.src.tar.xz b/clang-docs-16.0.2.src.tar.xz
new file mode 100644
index 0000000..6dbcadf
--- /dev/null
+++ b/clang-docs-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62167a6ed9dd90b8fc8995a535ee7a4381d1ed24ee8d2e9f883730a72dcae642
+size 1551396
diff --git a/clang-tools-extra-16.0.1.src.tar.xz b/clang-tools-extra-16.0.1.src.tar.xz
deleted file mode 100644
index b653db4..0000000
--- a/clang-tools-extra-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:982ca2dd6bfb64822014874b13dddcfbaceafe6a768c9ce4c41b3c0c81bbf9fd
-size 3152108
diff --git a/clang-tools-extra-16.0.1.src.tar.xz.sig b/clang-tools-extra-16.0.1.src.tar.xz.sig
deleted file mode 100644
index 4371f58..0000000
Binary files a/clang-tools-extra-16.0.1.src.tar.xz.sig and /dev/null differ
diff --git a/clang-tools-extra-16.0.2.src.tar.xz b/clang-tools-extra-16.0.2.src.tar.xz
new file mode 100644
index 0000000..9d7b4f9
--- /dev/null
+++ b/clang-tools-extra-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ceb18abc3e1c28e88920bdcf31b35b16b66ebe3a46c113bda507a2871116f4b
+size 3151972
diff --git a/clang-tools-extra-16.0.2.src.tar.xz.sig b/clang-tools-extra-16.0.2.src.tar.xz.sig
new file mode 100644
index 0000000..e227527
Binary files /dev/null and b/clang-tools-extra-16.0.2.src.tar.xz.sig differ
diff --git a/cmake-16.0.1.src.tar.xz b/cmake-16.0.1.src.tar.xz
deleted file mode 100644
index d8b3cea..0000000
--- a/cmake-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7b070b0ea71251c81b1a3dcdc6ccd28f59615e3e386c461456c5c246406acdc
-size 9000
diff --git a/cmake-16.0.1.src.tar.xz.sig b/cmake-16.0.1.src.tar.xz.sig
deleted file mode 100644
index 901a2c7..0000000
Binary files a/cmake-16.0.1.src.tar.xz.sig and /dev/null differ
diff --git a/cmake-16.0.2.src.tar.xz b/cmake-16.0.2.src.tar.xz
new file mode 100644
index 0000000..c35f30f
--- /dev/null
+++ b/cmake-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59c7239ec20c4d0bf3325ed3bb7ec8dad585632b0d9a07f0c2580e1ffe2abb22
+size 9000
diff --git a/cmake-16.0.2.src.tar.xz.sig b/cmake-16.0.2.src.tar.xz.sig
new file mode 100644
index 0000000..4d50363
Binary files /dev/null and b/cmake-16.0.2.src.tar.xz.sig differ
diff --git a/compiler-rt-16.0.1.src.tar.xz b/compiler-rt-16.0.1.src.tar.xz
deleted file mode 100644
index 347ec68..0000000
--- a/compiler-rt-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ce77091b5169bb2bd37002cf9b4d0cb7c085c17c9ccc6739d450ff258da3f8f0
-size 2354996
diff --git a/compiler-rt-16.0.1.src.tar.xz.sig b/compiler-rt-16.0.1.src.tar.xz.sig
deleted file mode 100644
index 189e8f1..0000000
Binary files a/compiler-rt-16.0.1.src.tar.xz.sig and /dev/null differ
diff --git a/compiler-rt-16.0.2.src.tar.xz b/compiler-rt-16.0.2.src.tar.xz
new file mode 100644
index 0000000..f61e36f
--- /dev/null
+++ b/compiler-rt-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46abe68f006646c15f6d551a2be0ac27e681c5fcc646d712389a5e50ddf69c60
+size 2357816
diff --git a/compiler-rt-16.0.2.src.tar.xz.sig b/compiler-rt-16.0.2.src.tar.xz.sig
new file mode 100644
index 0000000..74c3fa9
Binary files /dev/null and b/compiler-rt-16.0.2.src.tar.xz.sig differ
diff --git a/libcxx-16.0.1.src.tar.xz b/libcxx-16.0.1.src.tar.xz
deleted file mode 100644
index 2918541..0000000
--- a/libcxx-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de75b96aeb30af355b55326ce97f1a38874a1476d198402be3fbb0ff0d49d1f0
-size 3647592
diff --git a/libcxx-16.0.1.src.tar.xz.sig b/libcxx-16.0.1.src.tar.xz.sig
deleted file mode 100644
index 8074164..0000000
Binary files a/libcxx-16.0.1.src.tar.xz.sig and /dev/null differ
diff --git a/libcxx-16.0.2.src.tar.xz b/libcxx-16.0.2.src.tar.xz
new file mode 100644
index 0000000..d377ce3
--- /dev/null
+++ b/libcxx-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51989c73dad601b849b96c6d0da0b9a0216bb07ad795746d935e9fbb2bcc4ab1
+size 3653716
diff --git a/libcxx-16.0.2.src.tar.xz.sig b/libcxx-16.0.2.src.tar.xz.sig
new file mode 100644
index 0000000..ab32c97
Binary files /dev/null and b/libcxx-16.0.2.src.tar.xz.sig differ
diff --git a/libcxxabi-16.0.1.src.tar.xz b/libcxxabi-16.0.1.src.tar.xz
deleted file mode 100644
index f664842..0000000
--- a/libcxxabi-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8d9aa2e409e6acd93ae91fa92b16e5d7ce91ca10160a263ec71c72d56a64221e
-size 573576
diff --git a/libcxxabi-16.0.1.src.tar.xz.sig b/libcxxabi-16.0.1.src.tar.xz.sig
deleted file mode 100644
index 367dd11..0000000
Binary files a/libcxxabi-16.0.1.src.tar.xz.sig and /dev/null differ
diff --git a/libcxxabi-16.0.2.src.tar.xz b/libcxxabi-16.0.2.src.tar.xz
new file mode 100644
index 0000000..7f3f030
--- /dev/null
+++ b/libcxxabi-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d70c0b325ba5e4191aa7b06995b2fc6423dff905d142ede93759a269ddb002b
+size 573596
diff --git a/libcxxabi-16.0.2.src.tar.xz.sig b/libcxxabi-16.0.2.src.tar.xz.sig
new file mode 100644
index 0000000..7abbde1
Binary files /dev/null and b/libcxxabi-16.0.2.src.tar.xz.sig differ
diff --git a/lld-16.0.1.src.tar.xz b/lld-16.0.1.src.tar.xz
deleted file mode 100644
index bc65902..0000000
--- a/lld-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b31800095dbd83dcdd71d84702af9b9d0fd50f408105d5e54853615ee54b3fb6
-size 1453312
diff --git a/lld-16.0.1.src.tar.xz.sig b/lld-16.0.1.src.tar.xz.sig
deleted file mode 100644
index 63c08f0..0000000
Binary files a/lld-16.0.1.src.tar.xz.sig and /dev/null differ
diff --git a/lld-16.0.2.src.tar.xz b/lld-16.0.2.src.tar.xz
new file mode 100644
index 0000000..b8f14d5
--- /dev/null
+++ b/lld-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cec17924f916614aa85b5e3206fdab2613b9b0d25c93be7e3f9d7de87fc34da7
+size 1453092
diff --git a/lld-16.0.2.src.tar.xz.sig b/lld-16.0.2.src.tar.xz.sig
new file mode 100644
index 0000000..84a958d
Binary files /dev/null and b/lld-16.0.2.src.tar.xz.sig differ
diff --git a/lldb-16.0.1.src.tar.xz b/lldb-16.0.1.src.tar.xz
deleted file mode 100644
index 8e9db76..0000000
--- a/lldb-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58d15a7464ae64591a4bee02f110af9995f2925bbc5a8b3cdd2a00bb9aa5682c
-size 10379168
diff --git a/lldb-16.0.1.src.tar.xz.sig b/lldb-16.0.1.src.tar.xz.sig
deleted file mode 100644
index 21f34d3..0000000
Binary files a/lldb-16.0.1.src.tar.xz.sig and /dev/null differ
diff --git a/lldb-16.0.2.src.tar.xz b/lldb-16.0.2.src.tar.xz
new file mode 100644
index 0000000..2af708a
--- /dev/null
+++ b/lldb-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0991ebd6d1ca959753364d4727ecf89f26e75a224e36a9e72d580b0c22149bcc
+size 10379116
diff --git a/lldb-16.0.2.src.tar.xz.sig b/lldb-16.0.2.src.tar.xz.sig
new file mode 100644
index 0000000..28c0269
Binary files /dev/null and b/lldb-16.0.2.src.tar.xz.sig differ
diff --git a/llvm-16.0.1.src.tar.xz b/llvm-16.0.1.src.tar.xz
deleted file mode 100644
index f4bd495..0000000
--- a/llvm-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17d2142be9ff75c31ad76c53af7409974842545b94aaeac17f38b3b8567b0582
-size 56148112
diff --git a/llvm-16.0.1.src.tar.xz.sig b/llvm-16.0.1.src.tar.xz.sig
deleted file mode 100644
index 884e950..0000000
Binary files a/llvm-16.0.1.src.tar.xz.sig and /dev/null differ
diff --git a/llvm-16.0.2.src.tar.xz b/llvm-16.0.2.src.tar.xz
new file mode 100644
index 0000000..eee6524
--- /dev/null
+++ b/llvm-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ace409ccf932052b2587a8774532774b06fa91bc4ce76f55e991396e96f8700
+size 56146144
diff --git a/llvm-16.0.2.src.tar.xz.sig b/llvm-16.0.2.src.tar.xz.sig
new file mode 100644
index 0000000..ea11bac
Binary files /dev/null and b/llvm-16.0.2.src.tar.xz.sig differ
diff --git a/llvm-do-not-install-static-libraries.patch b/llvm-do-not-install-static-libraries.patch
index 07042cf..3a829f9 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-16.0.1.src/cmake/modules/AddClang.cmake
+Index: clang-16.0.2.src/cmake/modules/AddClang.cmake
 ===================================================================
---- a/clang-16.0.1.src/cmake/modules/AddClang.cmake
-+++ b/clang-16.0.1.src/cmake/modules/AddClang.cmake
+--- a/clang-16.0.2.src/cmake/modules/AddClang.cmake
++++ b/clang-16.0.2.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-16.0.1.src/cmake/modules/AddLLD.cmake
+Index: lld-16.0.2.src/cmake/modules/AddLLD.cmake
 ===================================================================
---- a/lld-16.0.1.src/cmake/modules/AddLLD.cmake
-+++ b/lld-16.0.1.src/cmake/modules/AddLLD.cmake
+--- a/lld-16.0.2.src/cmake/modules/AddLLD.cmake
++++ b/lld-16.0.2.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-16.0.1.src/cmake/modules/AddLLD.cmake
      if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)
        add_llvm_install_targets(install-${name}
          DEPENDS ${name}
-Index: polly-16.0.1.src/cmake/polly_macros.cmake
+Index: polly-16.0.2.src/cmake/polly_macros.cmake
 ===================================================================
---- a/polly-16.0.1.src/cmake/polly_macros.cmake
-+++ b/polly-16.0.1.src/cmake/polly_macros.cmake
+--- a/polly-16.0.2.src/cmake/polly_macros.cmake
++++ b/polly-16.0.2.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-16.0.1.src/cmake/polly_macros.cmake
  endmacro(add_polly_library)
  
  macro(add_polly_loadable_module name)
-Index: polly-16.0.1.src/lib/CMakeLists.txt
+Index: polly-16.0.2.src/lib/CMakeLists.txt
 ===================================================================
---- a/polly-16.0.1.src/lib/CMakeLists.txt
-+++ b/polly-16.0.1.src/lib/CMakeLists.txt
+--- a/polly-16.0.2.src/lib/CMakeLists.txt
++++ b/polly-16.0.2.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-16.0.1.src.tar.xz b/llvm-docs-16.0.1.src.tar.xz
deleted file mode 100644
index 8e66301..0000000
--- a/llvm-docs-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e87f6454ca54a1c4bb454ba8b9d3b83442a92ca7e0eb6a7592f38380967882f
-size 7058444
diff --git a/llvm-docs-16.0.2.src.tar.xz b/llvm-docs-16.0.2.src.tar.xz
new file mode 100644
index 0000000..65a6cff
--- /dev/null
+++ b/llvm-docs-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38ab5335ae66bde60e846358bff0c3e21b04e66583952b587d640f99415cfeb9
+size 7058380
diff --git a/llvm16.changes b/llvm16.changes
index 09025b0..a53eedc 100644
--- a/llvm16.changes
+++ b/llvm16.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr 21 21:07:38 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Update to version 16.0.2.
+  * This release contains bug-fixes for the LLVM 16.0.0 release.
+    This release is API and ABI compatible with 16.0.0.
+- Rebase llvm-do-not-install-static-libraries.patch.
+
 -------------------------------------------------------------------
 Tue Apr 18 20:40:44 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 
diff --git a/llvm16.spec b/llvm16.spec
index 58e2279..030fdc8 100644
--- a/llvm16.spec
+++ b/llvm16.spec
@@ -16,14 +16,14 @@
 #
 
 
-%define _relver 16.0.1
+%define _relver 16.0.2
 %define _version %_relver%{?_rc:rc%_rc}
 %define _tagver %_relver%{?_rc:-rc%_rc}
 %define _minor  16.0
 %define _sonum  16
 %define _itsme16 1
 # Integer version used by update-alternatives
-%define _uaver  1601
+%define _uaver  1602
 %define _soclang 13
 %define _socxx  1
 
diff --git a/openmp-16.0.1.src.tar.xz b/openmp-16.0.1.src.tar.xz
deleted file mode 100644
index d73e8d0..0000000
--- a/openmp-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3385718b1865c7a9ef45e8923a8e2487d23c20e1b8b4c18df6c5a2881eddf18a
-size 1278184
diff --git a/openmp-16.0.1.src.tar.xz.sig b/openmp-16.0.1.src.tar.xz.sig
deleted file mode 100644
index c3242d3..0000000
Binary files a/openmp-16.0.1.src.tar.xz.sig and /dev/null differ
diff --git a/openmp-16.0.2.src.tar.xz b/openmp-16.0.2.src.tar.xz
new file mode 100644
index 0000000..79f994f
--- /dev/null
+++ b/openmp-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d685c6cf0ab082acbe4ce63cab336e51a761edf7f2985017d91068070bc274d7
+size 1278160
diff --git a/openmp-16.0.2.src.tar.xz.sig b/openmp-16.0.2.src.tar.xz.sig
new file mode 100644
index 0000000..2c1d4f8
Binary files /dev/null and b/openmp-16.0.2.src.tar.xz.sig differ
diff --git a/polly-16.0.1.src.tar.xz b/polly-16.0.1.src.tar.xz
deleted file mode 100644
index 5a3df25..0000000
--- a/polly-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8751037ece603a5dcb52f589002af4032c763005422e08cae92227733b1a9955
-size 9356908
diff --git a/polly-16.0.1.src.tar.xz.sig b/polly-16.0.1.src.tar.xz.sig
deleted file mode 100644
index 41612ad..0000000
Binary files a/polly-16.0.1.src.tar.xz.sig and /dev/null differ
diff --git a/polly-16.0.2.src.tar.xz b/polly-16.0.2.src.tar.xz
new file mode 100644
index 0000000..30b46a6
--- /dev/null
+++ b/polly-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:549dd926ef62ee078a1b1b34b13ca240f56a0fcfce5938b787fb390b5e1a8799
+size 9360836
diff --git a/polly-16.0.2.src.tar.xz.sig b/polly-16.0.2.src.tar.xz.sig
new file mode 100644
index 0000000..e849c3e
Binary files /dev/null and b/polly-16.0.2.src.tar.xz.sig differ
diff --git a/third-party-16.0.1.src.tar.xz b/third-party-16.0.1.src.tar.xz
deleted file mode 100644
index 707b546..0000000
--- a/third-party-16.0.1.src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08ea121e31b0c6a6e81c811aacc0326dc1e06eb4919b2ac4c8d26f5016d9bb0a
-size 383500
diff --git a/third-party-16.0.1.src.tar.xz.sig b/third-party-16.0.1.src.tar.xz.sig
deleted file mode 100644
index 321a6e9..0000000
Binary files a/third-party-16.0.1.src.tar.xz.sig and /dev/null differ
diff --git a/third-party-16.0.2.src.tar.xz b/third-party-16.0.2.src.tar.xz
new file mode 100644
index 0000000..084ea54
--- /dev/null
+++ b/third-party-16.0.2.src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e89b3854056faa02447304010e9198e0f3f63539e0d4cb2dff4c1ec763cb9b7
+size 383456
diff --git a/third-party-16.0.2.src.tar.xz.sig b/third-party-16.0.2.src.tar.xz.sig
new file mode 100644
index 0000000..085b431
Binary files /dev/null and b/third-party-16.0.2.src.tar.xz.sig differ