diff --git a/.gitignore b/.gitignore
index 90d97e9..6e4a9e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ advancecomp-1.15.tar.gz
 /advancecomp-2.1.tar.gz
 /advancecomp-2.3.tar.gz
 /advancecomp-2.4.tar.gz
+/advancecomp-2.5.tar.gz
+/advancecomp-2.6.tar.gz
diff --git a/advancecomp.rpmlintrc b/advancecomp.rpmlintrc
new file mode 100644
index 0000000..4e393f3
--- /dev/null
+++ b/advancecomp.rpmlintrc
@@ -0,0 +1,6 @@
+# Not real spelling errors
+addFilter(r" spelling-error \('[Rr]ecompression',")
+addFilter(r" spelling-error \('([pm]ng|gz)',")
+addFilter(r" spelling-error \('adv(zip|[pm]ng|def)',")
+# Intentional, with a justifying spec-file comment
+addFilter(r" no-%check-section")
diff --git a/advancecomp.spec b/advancecomp.spec
index f949b14..3c193c4 100644
--- a/advancecomp.spec
+++ b/advancecomp.spec
@@ -1,5 +1,5 @@
 Name:           advancecomp
-Version:        2.4
+Version:        2.6
 Release:        %autorelease
 Summary:        Recompression utilities for .png, .mng, .zip and .gz files
 
@@ -14,15 +14,21 @@ Summary:        Recompression utilities for .png, .mng, .zip and .gz files
 #   of the sources that would be covered by the “unRAR license restriction” or
 #   the BSD-3-Clause license for LZFSE are present in this fork.
 #
-#   Certain build-system files, which do not contribute to the license of the
-#   binary RPM, are under other permissible licenses.
-#
 # However, in version 1.17, the COPYING file was updated to GPLv3, with a
 # changelog message (in HISTORY and elsewhere) of “Changes to GPL3.” We
 # interpret this as an overall license of GPL-3.0-only.
 License:        GPL-3.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
+# Additionally, the following bundled libraries are removed in %%prep and do
+# not contribute to the licenses of the binary RPMs:
+#
+# Apache-2.0:
+#   - zopfli/
+# MIT:
+#   - libdeflate/
+SourceLicense:  %{license} AND Apache-2.0 AND MIT
 URL:            https://www.advancemame.it/
-Source0:        https://github.com/amadvance/advancecomp/archive/v%{version}/advancecomp-%{version}.tar.gz
+%global forgeurl https://github.com/amadvance/advancecomp
+Source:         %{forgeurl}/archive/v%{version}/advancecomp-%{version}.tar.gz
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -37,10 +43,13 @@ BuildRequires:  dos2unix
 BuildRequires:  zlib-devel
 
 # Unbundled downstream
-BuildRequires:  pkgconfig(libdeflate)
-
+BuildRequires:  pkgconfig(libdeflate) >= 1.19
 BuildRequires:  zopfli-devel
 
+# The point of the 2.6 release was to upgrade the bundled libdeflate; enforce
+# this on the unbundled libdeflate.
+Requires:       libdeflate >= 1.19
+
 # From 7z/README:
 #
 #   This directory contains some source files from the
@@ -75,11 +84,12 @@ This package contains:
 
 
 %prep
-%autosetup -p1
+%autosetup
+
 dos2unix -k doc/*.txt
 
 # Patch out bundled libdeflate
-rm -rvf libdeflate
+rm -rv libdeflate
 sed -r -i '/libdeflate[\/_]/d' Makefile.am
 # Fix up #include paths. The find-then-modify pattern keeps us from discarding
 # mtimes on any sources that do not need modification.
@@ -89,7 +99,7 @@ find . -type f -exec gawk \
   xargs -r -t sed -r -i 's@^([[:blank:]]*#include.*)libdeflate/@\1@'
 
 # Patch out bundled zopfli
-rm -rvf zopfli
+rm -rv zopfli
 sed -r -i \
     -e '/zopfli[\/_]/d' \
     -e 's/((\(7z_SOURCES\)|WindowOut\.h).*)[[:blank:]]*\\/\1/' \
@@ -102,8 +112,7 @@ find . -type f -exec gawk \
   xargs -r -t sed -r -i -e 's@^([[:blank:]]*#include.*)zopfli/@\1@'
 
 
-%build
-%set_build_flags
+%conf
 autoreconf --force --install --verbose
 
 # Link against system libdeflate
@@ -115,6 +124,9 @@ export LDFLAGS="$(pkgconf --libs libdeflate) ${LDFLAGS-}"
 export LDFLAGS="-lzopfli ${LDFLAGS-}"
 
 %configure
+
+
+%build
 %make_build
 
 
diff --git a/changelog b/changelog
index 7e1a0b9..27f0b1a 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,12 @@
 - Remove unnecessary BR on tofrodos
 - Properly document bundled 7z code
 
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 3b60e66..a8812ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (advancecomp-2.4.tar.gz) = 648e89b684725743df4338a0958cdb9c37a7676f4b1a7209d016be0348d089eae9a0d20b3531838fc42887990f4c57749926c27e619887d8106a197961696a06
+SHA512 (advancecomp-2.6.tar.gz) = 63cbb0578f96fd3f55ccb49e31bfe945649d36a11558aa482332440943d6d347f161de797b8d4469562b1d551b274c22fe08818179926d56aa4746581d3926dd