diff --git a/llvm16.changes b/llvm16.changes
index d2aa278..83f559c 100644
--- a/llvm16.changes
+++ b/llvm16.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 11 07:38:12 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- Use %_target_* for determining the compiler host triple (boo#1218701)
+
 -------------------------------------------------------------------
 Thu Nov 30 22:53:03 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 
diff --git a/llvm16.spec b/llvm16.spec
index ea9d0a6..ea9aca9 100644
--- a/llvm16.spec
+++ b/llvm16.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package llvm16
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -68,15 +68,15 @@
 # Figure out the host triple.
 %ifarch armv6hl
 # See https://build.opensuse.org/request/show/968066.
-%define host_cpu armv6kz
+%define target_cpu armv6kz
 %else
-%define host_cpu %{_host_cpu}
+%define target_cpu %{_target_cpu}
 %endif
 
 %ifarch %{arm}
-%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}-gnueabihf
+%define host_triple %{target_cpu}-%{_target_vendor}-%{_target_os}-gnueabihf
 %else
-%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}
+%define host_triple %{target_cpu}-%{_target_vendor}-%{_target_os}
 %endif
 
 # By default, build everything.
@@ -417,7 +417,7 @@ BuildRequires:  python3-base
 BuildRequires:  pkgconfig(libedit)
 BuildRequires:  pkgconfig(zlib)
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 # llvm does not work on s390
 ExcludeArch:    s390
 %if %{with ffi}
@@ -507,7 +507,7 @@ Summary:        CLANG frontend for LLVM
 Group:          Development/Languages/C and C++
 URL:            https://clang.llvm.org/
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 Recommends:     clang-tools
 Recommends:     gcc
 Recommends:     glibc-devel
@@ -711,7 +711,7 @@ Summary:        Linker for Clang/LLVM
 Group:          Development/Tools/Building
 URL:            https://lld.llvm.org/
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 
 %description -n lld%{_sonum}
 LLD is a linker from the LLVM project. That is a drop-in replacement for system linkers and runs much faster than them. It also provides features that are useful for toolchain developers.
@@ -743,7 +743,7 @@ BuildRequires:  pkgconfig(panel)
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(zlib)
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 Recommends:     python3-lldb%{_sonum}
 
 %description -n lldb%{_sonum}
@@ -1661,8 +1661,8 @@ fi
 %{_libdir}/libomptarget-amdgpu-*.bc
 %{_libdir}/libomptarget-nvptx-*.bc
 %ifarch aarch64 ppc64le x86_64
-%{_libdir}/libomptarget.rtl.{%{host_cpu},amdgpu,cuda}{,.nextgen}.so
-%{_libdir}/libomptarget.rtl.{%{host_cpu},amdgpu,cuda}{,.nextgen}.so.%{_sonum}
+%{_libdir}/libomptarget.rtl.{%{target_cpu},amdgpu,cuda}{,.nextgen}.so
+%{_libdir}/libomptarget.rtl.{%{target_cpu},amdgpu,cuda}{,.nextgen}.so.%{_soname}
 %endif
 %endif
 %{_libdir}/cmake/openmp