diff --git a/debian/changelog b/debian/changelog
index 99a785d0..65fa40ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ llvm-toolchain-16 (1:16.0.6-2) unstable; urgency=medium
   * Add back powerpc to gold architectures
   * Use bfd linker on p*pc*
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 18 Jun 2023 09:25:43 +0200
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 24 Jun 2023 20:45:34 +0200
 
 llvm-toolchain-16 (1:16.0.6-1) unstable; urgency=medium
 
diff --git a/debian/patches/HIP-search-path-fix.patch b/debian/patches/HIP-search-path-fix.patch
index fc02be4c..79e82bed 100644
--- a/debian/patches/HIP-search-path-fix.patch
+++ b/debian/patches/HIP-search-path-fix.patch
@@ -17,9 +17,9 @@ diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChain
 index acedcfabefe1c..1eb22ed8704c9 100644
 --- a/clang/lib/Driver/ToolChains/AMDGPU.cpp
 +++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp
-@@ -10,7 +10,6 @@
- #include "CommonArgs.h"
+@@ -11,7 +11,6 @@
  #include "clang/Basic/TargetID.h"
+ #include "clang/Config/config.h"
  #include "clang/Driver/Compilation.h"
 -#include "clang/Driver/Distro.h"
  #include "clang/Driver/DriverDiagnostic.h"
diff --git a/debian/patches/new-cmake-build-fix.patch b/debian/patches/new-cmake-build-fix.patch
index f0d84224..85e3c40f 100644
--- a/debian/patches/new-cmake-build-fix.patch
+++ b/debian/patches/new-cmake-build-fix.patch
@@ -113,29 +113,27 @@ index d0eda6d8ca39a..ca3cb43c285db 100644
  
  # Check for versioned symbols
  function(libomp_check_version_symbols retval)
-@@ -128,14 +128,14 @@ check_symbol_exists(_aligned_malloc "mal
+@@ -133,13 +133,13 @@ check_symbol_exists(_aligned_malloc "malloc.h" LIBOMP_HAVE__ALIGNED_MALLOC)
  
  # Check linker flags
  if(WIN32)
 -  libomp_check_linker_flag(/SAFESEH LIBOMP_HAVE_SAFESEH_FLAG)
-+  llvm_check_compiler_linker_flag(/SAFESEH LIBOMP_HAVE_SAFESEH_FLAG)
++  llvm_check_compiler_linker_flag(C /SAFESEH LIBOMP_HAVE_SAFESEH_FLAG)
  elseif(NOT APPLE)
 -  libomp_check_linker_flag(-Wl,-x LIBOMP_HAVE_X_FLAG)
--  libomp_check_linker_flag(-Wl,--warn-shared-textrel LIBOMP_HAVE_WARN_SHARED_TEXTREL_FLAG)
 -  libomp_check_linker_flag(-Wl,--as-needed LIBOMP_HAVE_AS_NEEDED_FLAG)
--  libomp_check_linker_flag("-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
+-  libomp_check_linker_flag("-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_test_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
 -  libomp_check_linker_flag(-static-libgcc LIBOMP_HAVE_STATIC_LIBGCC_FLAG)
 -  libomp_check_linker_flag(-Wl,-z,noexecstack LIBOMP_HAVE_Z_NOEXECSTACK_FLAG)
 +  llvm_check_compiler_linker_flag(C -Wl,-x LIBOMP_HAVE_X_FLAG)
-+  llvm_check_compiler_linker_flag(C -Wl,--warn-shared-textrel LIBOMP_HAVE_WARN_SHARED_TEXTREL_FLAG)
 +  llvm_check_compiler_linker_flag(C -Wl,--as-needed LIBOMP_HAVE_AS_NEEDED_FLAG)
-+  llvm_check_compiler_linker_flag(C "-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
++  llvm_check_compiler_linker_flag(C "-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_test_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
 +  llvm_check_compiler_linker_flag(C -static-libgcc LIBOMP_HAVE_STATIC_LIBGCC_FLAG)
 +  llvm_check_compiler_linker_flag(C -Wl,-z,noexecstack LIBOMP_HAVE_Z_NOEXECSTACK_FLAG)
  endif()
  
  # Check Intel(R) C Compiler specific flags
-@@ -146,8 +146,8 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Intel" OR CMAKE_C_COMPILER_ID STREQUAL "IntelLL
+@@ -150,8 +150,8 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Intel" OR CMAKE_C_COMPILER_ID STREQUAL "IntelLL
    check_cxx_compiler_flag(-Qoption,cpp,--extended_float_types LIBOMP_HAVE_EXTENDED_FLOAT_TYPES_FLAG)
    check_cxx_compiler_flag(-falign-stack=maintain-16-byte LIBOMP_HAVE_FALIGN_STACK_FLAG)
    check_cxx_compiler_flag("-opt-streaming-stores never" LIBOMP_HAVE_OPT_STREAMING_STORES_FLAG)