diff --git a/sources b/sources
index 3f5cf2c..d38a759 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (ftest-c4ad4af.tar.gz) = ac328665d2f22fe72f7252d4f7ae84c74ea551407ba618151ef1c281159df8744f1e6efb9b21d4e1df774528f0b979d45ee5d82d3e8ab146aa9f2ad91b0b6d37
-SHA512 (utfcpp-3.2.5.tar.gz) = 1ce12c8158a2f3bcddec104ceacedaea4031b4c88fc0fa1f1fae8dfa8df81c846861df9d01e8f294d79b9e4ab8c51bd1289f404eed24d07abc760688fee13090
+SHA512 (utfcpp-4.0.5.tar.gz) = 49ca33bfb2ee44515f555184b51191f7b706a228fb84ddc62e1e6b59c7d69a5ff836f38694daad0012a0f651b6199451974fe44ebe80081df00cf8c2759e3249
diff --git a/utf8cpp-cmake.patch b/utf8cpp-cmake.patch
new file mode 100644
index 0000000..5f6324a
--- /dev/null
+++ b/utf8cpp-cmake.patch
@@ -0,0 +1,24 @@
+diff -up utfcpp-4.0.4/CMakeLists.txt.orig utfcpp-4.0.4/CMakeLists.txt
+--- utfcpp-4.0.4/CMakeLists.txt.orig	2023-12-10 16:42:20.000000000 +0100
++++ utfcpp-4.0.4/CMakeLists.txt	2023-12-14 12:37:01.511860031 +0100
+@@ -35,17 +35,17 @@ install(TARGETS ${PROJECT_NAME}
+ configure_package_config_file(
+     "${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in"
+     "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+-    INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
++    INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}
+ )
+ 
+ install(EXPORT ${PROJECT_NAME}Targets
+         FILE ${PROJECT_NAME}Targets.cmake
+         NAMESPACE ${PROJECT_NAME}::
+-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
++        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME})
+ 
+ install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+               "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
++        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME})
+ 
+ install(FILES ${PROJECT_SOURCE_DIR}/source/utf8.h DESTINATION include/utf8cpp)
+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/utf8 DESTINATION
diff --git a/utf8cpp-noarch.patch b/utf8cpp-noarch.patch
deleted file mode 100644
index a6d24bf..0000000
--- a/utf8cpp-noarch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up utfcpp-3.2.4/CMakeLists.txt.noarch utfcpp-3.2.4/CMakeLists.txt
---- utfcpp-3.2.4/CMakeLists.txt.noarch	2023-08-31 14:09:08.102223665 +0200
-+++ utfcpp-3.2.4/CMakeLists.txt	2023-08-31 14:09:32.632366839 +0200
-@@ -24,7 +24,7 @@ if(UTF8_INSTALL)
-         set(DEF_INSTALL_CMAKE_DIR CMake)
-     else()
-         include(GNUInstallDirs) # define CMAKE_INSTALL_*
--        set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/utf8cpp)
-+        set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_DATADIR}/cmake/utf8cpp)
-     endif()
- 
-     if(${CMAKE_VERSION} VERSION_GREATER "3.14")
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 56dc483..f58b177 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -5,15 +5,15 @@
 %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    3.2.5
+Version:    4.0.5
 Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
 URL:        https://github.com/nemtrif/utfcpp
 Source0:    https://github.com/nemtrif/utfcpp/archive/v%{version}/utfcpp-%{version}.tar.gz
 Source1:    https://github.com/nemtrif/ftest/archive/%{ftest_commit}/ftest-%{ftest_shortcommit}.tar.gz
-# put cmake import file in arch-agnostic directory
-Patch1:     %{name}-noarch.patch
+# put cmake import file in correct directory
+Patch0:     %{name}-cmake.patch
 BuildRequires: cmake
 BuildRequires: gcc-c++
 
@@ -51,37 +51,47 @@ rmdir extern/ftest && mv ftest-%{ftest_commit} extern/ftest
 
 %build
 %cmake \
-   -DUTF8_TESTS=ON \
-   -DUTF8_SAMPLES=ON \
    %{nil}
 %cmake_build
+pushd tests
+%cmake
+%cmake_build
+popd
 
 %install
 %cmake_install
 pushd %{buildroot}%{_includedir}
 ln -s utf8cpp/utf8.h ./
 mkdir utf8
-for f in {{un,}checked,core,cpp11,cpp17}.h ; do
+for f in {{un,}checked,core,cpp{11,17,20}}.h ; do
     ln -s ../utf8cpp/utf8/${f} utf8/
 done
 popd
 
 %check
+pushd tests
 %ctest
+popd
 
 %files devel
-%doc README.md samples/docsample.cpp
+%doc README.md
+%license LICENSE
 %{_includedir}/utf8.h
 %dir %{_includedir}/utf8
 %{_includedir}/utf8/checked.h
 %{_includedir}/utf8/core.h
 %{_includedir}/utf8/cpp11.h
 %{_includedir}/utf8/cpp17.h
+%{_includedir}/utf8/cpp20.h
 %{_includedir}/utf8/unchecked.h
 %{_includedir}/utf8cpp
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Wed Jan 03 2024 Dominik Mierzejewski <dominik@greysector.net> - 4.0.5-1
+- update to 4.0.5 (resolves rhbz#2245744)
+- include license text
+
 * Sun Oct 08 2023 Dominik Mierzejewski <dominik@greysector.net> - 3.2.5-1
 - update to 3.2.5 (resolves rhbz#2240785)