diff --git a/cmake-16.0.1.src.tar.xz b/cmake-16.0.1.src.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..ee563132336eac9571bda9c89e77153ecee46e8c
Binary files /dev/null and b/cmake-16.0.1.src.tar.xz differ
diff --git a/compiler-rt-15.0.7.src.tar.xz b/compiler-rt-15.0.7.src.tar.xz
deleted file mode 100644
index c5659383f7d8e95fc178d06ddc1d6988d85d8d3e..0000000000000000000000000000000000000000
Binary files a/compiler-rt-15.0.7.src.tar.xz and /dev/null differ
diff --git a/compiler-rt-16.0.1.src.tar.xz b/compiler-rt-16.0.1.src.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..2f6513f0046beb78683220a0950cb054e28980dc
Binary files /dev/null and b/compiler-rt-16.0.1.src.tar.xz differ
diff --git a/compiler-rt.spec b/compiler-rt.spec
index a404f62ffdf9e46b4f5677b31bd784bff0b65937..df7885081e7209e0dbf95a92b86ac65b88f04b8a 100644
--- a/compiler-rt.spec
+++ b/compiler-rt.spec
@@ -1,7 +1,15 @@
 %define anolis_release 1
 %global toolchain clang
-%global compiler_rt_version 15.0.7
+
+%undefine _include_frame_pointers
+
+%global maj_ver 16
+%global min_ver 0
+%global patch_ver 1
+%global compiler_rt_version %{maj_ver}.%{min_ver}.%{patch_ver}
+
 %global crt_srcdir compiler-rt-%{compiler_rt_version}.src
+%global cmake_srcdir cmake-%{compiler_rt_version}.src
 
 # see https://sourceware.org/bugzilla/show_bug.cgi?id=25271
 %global optflags %(echo %{optflags} -D_DEFAULT_SOURCE)
@@ -17,14 +25,15 @@ Summary:	LLVM "compiler-rt" runtime libraries
 License:	Apache-2.0 WITH LLVM-exception OR NCSA OR MIT
 URL:		http://llvm.org
 Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}/%{crt_srcdir}.tar.xz
+Source3:        https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}/%{cmake_srcdir}.tar.xz
 
 BuildRequires:	clang
 BuildRequires:	cmake
 BuildRequires:	ninja-build
 BuildRequires:	python3
-# We need python3-devel for %%py3_shebang_fix
 BuildRequires:	python3-devel
 BuildRequires:	llvm-devel = %{version}
+BuildRequires:  zlib-devel
 
 Requires: clang-resource-filesystem = %{version}
 
@@ -43,12 +52,14 @@ BuildArch:      noarch
 The %{name}-doc package contains documentations for %{name}
 
 %prep
+%setup -T -q -b 3 -n %{cmake_srcdir}
+cd ..
+mv %{cmake_srcdir} cmake
 %autosetup -n %{crt_srcdir} -p2
 
 %py3_shebang_fix lib/hwasan/scripts/hwasan_symbolize
 
 %build
-# Copy CFLAGS into ASMFLAGS, so -fcf-protection is used when compiling assembly files.
 export ASMFLAGS=$CFLAGS
 
 %cmake	-GNinja \
@@ -62,36 +73,39 @@ export ASMFLAGS=$CFLAGS
 %cmake_build
 
 %install
-
 %cmake_install
 
 # move blacklist/abilist files to where clang expect them
-mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/share
-mv -v %{buildroot}%{_datadir}/*list.txt  %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/share/
+mkdir -p %{buildroot}%{_libdir}/clang/%{maj_ver}/share
+mv -v %{buildroot}%{_datadir}/*list.txt  %{buildroot}%{_libdir}/clang/%{maj_ver}/share/
 
 # move sanitizer libs to better place
 %global libclang_rt_installdir lib/linux
-mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib
-mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*clang_rt* %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib
-mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib/linux/
-pushd %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib
+mkdir -p %{buildroot}%{_libdir}/clang/%{maj_ver}/lib
+mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*_rt* %{buildroot}%{_libdir}/clang/%{maj_ver}/lib
+mkdir -p %{buildroot}%{_libdir}/clang/%{maj_ver}/lib/linux/
+pushd %{buildroot}%{_libdir}/clang/%{maj_ver}/lib
 for i in *.a *.so
 do
-	ln -s ../$i linux/$i
+        ln -s ../$i linux/$i
 done
+
 popd
 
 %files
 %license LICENSE.TXT
 %{_includedir}/*
-%{_libdir}/clang/%{compiler_rt_version}/lib/*
-%{_libdir}/clang/%{compiler_rt_version}/share/*
+%{_libdir}/clang/%{maj_ver}/lib/*
+%{_libdir}/clang/%{maj_ver}/share/*
 %{_bindir}/hwasan_symbolize
 
 %files doc
 %doc README.txt CODE_OWNERS.TXT docs/TestingGuide.rst
 
 %changelog
+* Fri Apr 14 2023 Funda Wang <fundawang@yeah.net> - 16.0.1-1
+- New version 16.0.1
+
 * Wed Feb 1 2023 Funda Wang <fundawang@yeah.net> - 15.0.7-1
 - New version 15.0.7