diff --git a/.gitignore b/.gitignore
index cd38fe8..9d396d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
 /aespipe-v2.4b.tar.bz2
 /aespipe-v2.4c.tar.bz2
 /aespipe-v2.4d.tar.bz2
-/aespipe.spec
-/aespipe-v2.4e-configure.patch
 /aespipe-v2.4e.tar.bz2
+/aespipe.spec
+/aespipe-v2.4e-link.patch
+/aespipe-v2.4e-underline.patch
+/aespipe-v2.4e-configure.patch
+/aespipe-v2.4f.tar.bz2
+/aespipe-v2.4g.tar.bz2
diff --git a/aespipe.spec b/aespipe.spec
index 1dab09d..8e428c4 100644
--- a/aespipe.spec
+++ b/aespipe.spec
@@ -1,13 +1,13 @@
-Summary:        AES-based encryption tool for tar/cpio and loop-aes imagemore 
+Summary:        AES-based encryption tool for tar/cpio and loop-aes imagemore
 Name:           aespipe
-Version:        2.4e
-Release:        5%{?dist}
-License:        GPLv2+
+Version:        2.4g
+Release:        7%{?dist}
+License:        GPL-2.0-or-later
 URL:            http://loop-aes.sourceforge.net/
-Source:         http://loop-aes.sourceforge.net/aespipe/aespipe-v%{version}.tar.bz2
-Patch0:         aespipe-v2.4e-configure.patch
+Source:         %{url}/aespipe/aespipe-v%{version}.tar.bz2
 BuildRequires:  gcc
 BuildRequires:  gpg
+BuildRequires:  make
 Requires:       gpg
 
 %description
@@ -23,12 +23,10 @@ existing disk partitions for use with the loop-AES encrypted loop-back
 kernel module.
 
 %prep
-%setup -q -n %{name}-v%{version}
-%global _default_patch_fuzz 3
-%patch0 -p1
+%autosetup -p1 -n %{name}-v%{version}
 
 %build
-# Package calls CC to link
+%set_build_flags
 %configure LDFLAGS="${CFLAGS}"
 
 %global make_target %{nil}
@@ -54,12 +52,46 @@ install -Dp -m0755 aespipe %{buildroot}%{_bindir}/aespipe
 %files
 %dir %{_defaultdocdir}/%{name}
 %{_defaultdocdir}/%{name}/*
-%{_mandir}/man1/*
+%{_mandir}/man1/aespipe.1*
 %{_bindir}/aespipe
 
 %changelog
-* Sun Aug 18 2019 Jirka Hladky <hladky.jiri@gmail.com> - 2.4e-5
-- Rebuild for F31
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.4g-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.4g-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.4g-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4g-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4g-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4g-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Oct 24 2023 Jirka Hladky <hladky.jiri@gmail.com> - 2.4g-1
+- Updated to version 2.4g. It sets -fno-strict-aliasing to WA RHEL-14046
+
+* Wed Oct 18 2023 Jirka Hladky <hladky.jiri@gmail.com> - 2.4f-2
+- WA got GCC bug https://issues.redhat.com/browse/RHEL-14046
+
+* Sun Aug 09 2020 Jirka Hladky <hladky.jiri@gmail.com> - 2.4f-1
+- Update to version 2.4f
+
+* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4e-7
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4e-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4e-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
 * Sun Aug 18 2019 Jirka Hladky <hladky.jiri@gmail.com> - 2.4e-4
 - Found the root cause with assembler linking - better patch
diff --git a/sources b/sources
index 7654d9e..afeb4f8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (aespipe.spec) = 52f9a6419739341712deaa2923f1c1d368d59ab162d77ef6531ab958eba97f97f29f4100015165bee9ceae8aa7b56eb5be366a2fb68256ab51cf9897a46627d5
-SHA512 (aespipe-v2.4e.tar.bz2) = e038f710ac971e5ba740648c0f255e8bc9fcea9be1a6b76208a453f21f013e1662c006d4f4495fa2b2560fd9b0c236947462a9b337a120073c6a5335b29f077e
-SHA512 (aespipe-v2.4e-configure.patch) = be6a1716f836b465639abdfeb41afe7cbe240fa780145e7cb370fda8998a95aa99b6a785de68ae69db2d21c14410c71a4782ea380fecb4920db109124a404384
+SHA512 (aespipe-v2.4g.tar.bz2) = e1a82bb68f9e337a714d8f230745f4de16b7ab637e257f9342b81193a9f5cf7f347ade76302ae0dabfb1d64d895635efa527a093ce92f12d059add38032f9057