diff --git a/0e56801f98db3e363c974fca794fa06022d40ee4.patch b/0e56801f98db3e363c974fca794fa06022d40ee4.patch
new file mode 100644
index 0000000..3489e12
--- /dev/null
+++ b/0e56801f98db3e363c974fca794fa06022d40ee4.patch
@@ -0,0 +1,12 @@
+diff -up a/src/zimg/colorspace/x86/operation_impl_x86.cpp b/src/zimg/colorspace/x86/operation_impl_x86.cpp
+--- a/src/zimg/colorspace/x86/operation_impl_x86.cpp
++++ b/src/zimg/colorspace/x86/operation_impl_x86.cpp
+@@ -19,7 +19,7 @@ std::unique_ptr<Operation> create_matrix
+ 		if (!ret && cpu == CPUClass::AUTO_64B && caps.avx512f)
+ 			ret = create_matrix_operation_avx512(m);
+ #endif
+-		if (!ret && caps.avx && !cpu_has_slow_avx(caps))
++		if (!ret && caps.avx2 && !cpu_has_slow_avx(caps))
+ 			ret = create_matrix_operation_avx(m);
+ 		if (!ret && caps.sse)
+ 			ret = create_matrix_operation_sse(m);
diff --git a/218.patch b/b013c7b006e6bee05b7964162f3a00402168e77f.patch
similarity index 93%
rename from 218.patch
rename to b013c7b006e6bee05b7964162f3a00402168e77f.patch
index 28ca5fc..be40ed8 100644
--- a/218.patch
+++ b/b013c7b006e6bee05b7964162f3a00402168e77f.patch
@@ -1,4 +1,4 @@
-From b4de5f36a6b1e31b891492c466888371afb6ee9b Mon Sep 17 00:00:00 2001
+From b013c7b006e6bee05b7964162f3a00402168e77f Mon Sep 17 00:00:00 2001
 From: Yaakov Selkowitz <yselkowi@redhat.com>
 Date: Tue, 18 Mar 2025 17:11:00 -0400
 Subject: [PATCH] Fix build with GCC 15
diff --git a/zimg.spec b/zimg.spec
index 27bcb3f..274317b 100644
--- a/zimg.spec
+++ b/zimg.spec
@@ -7,8 +7,9 @@ URL:            https://github.com/sekrit-twc/zimg
 
 Source0:        %{url}/archive/release-%{version}/%{name}-%{version}.tar.gz
 
-# Fix build with GCC 15
-Patch0:         https://github.com/sekrit-twc/zimg/pull/218.patch
+# Rebased from master on top of 3.0.6, should be removed in the next update
+Patch0:         b013c7b006e6bee05b7964162f3a00402168e77f.patch
+Patch1:         0e56801f98db3e363c974fca794fa06022d40ee4.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -52,17 +53,19 @@ find %{buildroot} -name '*.la' -delete
 # Pick up docs in the files section
 rm -fr %{buildroot}%{_docdir}/%{name}
 
-%ldconfig_scriptlets
-
 %files
 %license COPYING
 %doc README.md ChangeLog
 %{_libdir}/lib%{name}.so.2.0.0
 %{_libdir}/lib%{name}.so.2
 
+%check
+./testapp cpuinfo
+
 %files devel
 %{_bindir}/testapp
-%{_includedir}/*
+%{_includedir}/zimg.h
+%{_includedir}/zimg++.hpp
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc