diff --git a/.gitignore b/.gitignore
index 99d237d..0509e00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,13 @@
 /v6.63.tar.gz
+/v6.69.tar.gz
+/v6.73.tar.gz
+/v7.05.1.tar.gz
+/v7.07.tar.gz
+/v7.07.1.tar.gz
+/v7.20.tar.gz
+/v7.20.1.tar.gz
+/v7.21.tar.gz
+/v7.22.tar.gz
+/v7.23.tar.gz
+/v7.24.1.tar.gz
+/v7.24.2.tar.gz
diff --git a/sources b/sources
index 10d3690..6324fb5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v6.63.tar.gz) = 1c7babb86c817688c844e47058fb74e574b89ffc2ea93c78e9581023b3ad6deeaac6d97dd19484b8e4f85d5aa03328b9cfd792fdbc781ecd8f4d269f605339ae
+SHA512 (v7.24.2.tar.gz) = d8bcf248b4506f09ee70431f6c38d0d2eb7c3dfa110cbe700e7ae689e0a640f77ec337aeafda93d0f4fd7e9139a8e46dbf1cb99dd4a576667d71b05992a618b8
diff --git a/xbyak.spec b/xbyak.spec
index ad266ba..92f1c25 100644
--- a/xbyak.spec
+++ b/xbyak.spec
@@ -1,26 +1,26 @@
+%global debug_package %{nil}
+
 Summary:        A C++ JIT assembler for x86
 Name:           xbyak
 License:        BSD-3-Clause
 
-Version:        6.63
-Release:        3%{?dist}
+Version:        7.24.2
+Release:        %autorelease
 
 URL:            https://github.com/herumi/xbyak
-Source0:        %{url}/archive/refs/tags/v%{version}.tar.gz
+Source0:        %{url}/archive/v%{version}.tar.gz
 # exception testing of allocator gets hung up on glibc double free check
 Patch0:         xbyak-disable-noexecption-test3.patch
 
 Group:          Development/Libraries
-BuildArch:      noarch
 ExclusiveArch:  x86_64
 
-BuildRequires:  make
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
 BuildRequires:  sed
 
 %bcond_with check
 %if %{with check}
-# check
-BuildRequires:  gcc-c++
 #  -m32
 BuildRequires:  glibc-devel(x86-32), libstdc++(x86-32)
 BuildRequires:  nasm, yasm
@@ -47,22 +47,18 @@ It is named from a Japanese word 開闢, which means the beginning
 of the world.
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
 
 %build
-# nothing to build
+%cmake
+%cmake_build
 
 %install
-mkdir -p %{buildroot}%{_datadir}/xbyak
-cp COPYRIGHT %{buildroot}%{_datadir}/xbyak/
-cp readme.* %{buildroot}%{_datadir}/xbyak/
-cp doc/*.md %{buildroot}%{_datadir}/xbyak/
-# fix dos lines
-sed -i 's/\r$//' %{buildroot}%{_datadir}/xbyak/readme.txt
-cp -r sample %{buildroot}%{_datadir}/xbyak/
+%cmake_install
 
-%make_install PREFIX=%{buildroot}/usr
+# Install samples
+mkdir -p %{buildroot}%{_datadir}/xbyak/
+cp -pr sample %{buildroot}%{_datadir}/xbyak/
 
 %if %{with check}
 %check
@@ -70,23 +66,12 @@ make test
 %endif
 
 %files devel
-%dir %{_datadir}/xbyak
-%dir %{_includedir}/xbyak
-%license %{_datadir}/xbyak/COPYRIGHT
-%doc %{_datadir}/xbyak/readme.txt
-%doc %{_datadir}/xbyak/*.md
-%{_datadir}/xbyak/sample/
-%{_includedir}/xbyak/*.h
+%license COPYRIGHT
+%doc readme.md doc/changelog.md doc/usage.md
+%doc %lang(jp) readme.txt
+%{_datadir}/%{name}/
+%{_includedir}/%{name}/
+%{_libdir}/cmake/%{name}/
 
 %changelog
-* Thu Oct 27 2022 Tom Rix <trix@redhat.com> - 6.63-3
-- Make check optional
-
-* Mon Oct 24 2022 Tom Rix <trix@redhat.com> - 6.63-2
-- Add tests, samples
-- Change license to BSD-3-Clause
-- Check directory ownership
-- Package as static library
-
-* Fri Oct 21 2022 Tom Rix <trix@redhat.com> - 6.63-1
-- Initial release
+%autochangelog