diff --git a/Fix-build-with-gcc-14-Wincompatible-pointer-types.patch b/afflib-0003-Fix-build-with-gcc-14-Wincompatible-pointer-types.patch
similarity index 100%
rename from Fix-build-with-gcc-14-Wincompatible-pointer-types.patch
rename to afflib-0003-Fix-build-with-gcc-14-Wincompatible-pointer-types.patch
diff --git a/afflib.spec b/afflib.spec
index f8ba085..1be8728 100644
--- a/afflib.spec
+++ b/afflib.spec
@@ -1,9 +1,8 @@
-%global commit0 01210f488410a23838c54fcc22297cf08ac7de66
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-
 Name:           afflib
 Version:        3.7.20
 Release:        %autorelease
+# Automatically converted from old format: BSD with advertising - review is highly recommended.
+License:        LicenseRef-Callaway-BSD-with-advertising
 Summary:        Library to support the Advanced Forensic Format
 
 # Build also the python2 package
@@ -11,26 +10,33 @@ Summary:        Library to support the Advanced Forensic Format
 # Build also the python3 package
 %global         with_python3    1
 
+%global         gituser      sshock
+%global         gitname      AFFLIBv3
+%global         gitdate      20240324
+%global         commit       95bf6cb9cf344ed6dccb8eb12bc159a17e616adb
+%global         shortcommit %(c=%{commit}; echo ${c:0:7})
 
-License:        BSD with advertising
 URL:            https://github.com/sshock/AFFLIBv3
-#Source0:        %%{url}/archive/v%%{version}/%%{name}-%%{version}.tar.gz
-Source0:        %{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
+VCS:            https://github.com/sshock/AFFLIBv3
+#Source0:       %%{vcs}/archive/v%%{version}/%%{name}-%%{version}.tar.gz
+Source0:        %{vcs}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz#/%{name}-%{version}-%{shortcommit}.tar.gz
 
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
+BuildRequires:  make
 
 BuildRequires:  curl-devel
 BuildRequires:  expat-devel
-# GPLv2 FOSS incompatible with BSD with advertising
-##BuildRequires:  fuse-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  openssl-devel
+BuildRequires:  zlib-devel
+
+# GPLv2 FOSS incompatible with BSD with advertising
+##BuildRequires:  fuse-devel
 # GPLv2 FOSS incompatible with BSD with advertising
 ##BuildRequires:  readline-devel
-#BuildRequires:  libedit-devel - good replacement for readline - not supported for now
-BuildRequires:  zlib-devel
-BuildRequires: make
+#BuildRequires:   libedit-devel - good replacement for readline - not supported for now
+
 
 %if 0%{?with_python2}
 BuildRequires:  python2
@@ -112,7 +118,7 @@ basic metadata accessor functions. The binding is not currently complete.
 
 
 %prep
-%autosetup -p1 -n AFFLIBv3-%{commit0}
+%autosetup -p1 -n AFFLIBv3-%{commit}
 # prevent internal lzma to be built - testing
 #rm -rf lzma443
 
@@ -140,7 +146,7 @@ rm $(grep -rl '/\* Generated by Cython')
 
 %make_build
 cd pyaff
-%global py_setup_args build_ext --include-dirs %{_builddir}/AFFLIBv3-%{version}/include --library-dirs %{_builddir}/AFFLIBv3-%{version}/lib/.libs
+%global py_setup_args build_ext --include-dirs %{_builddir}/AFFLIBv3-%{commit}/include --library-dirs %{_builddir}/AFFLIBv3-%{commit}/lib/.libs
 %if 0%{?with_python2}
 %py2_build
 %endif
diff --git a/sources b/sources
index 351beb7..00522de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (afflib-01210f4.tar.gz) = de5932871e57e8702016011431540429d3820d868e0d810a3a4a35e50148708b350dfd4268855ee2eb71504cbab811c960339b6f68e90ed89401a86866efe4e4
+SHA512 (afflib-3.7.20-95bf6cb.tar.gz) = c0054a56396ccf25f434c3dcd1d26ab95ed284b9d8efeb936fc6d7e209a20b85e2a23e0b7b9df02a458a666b52b69f3a370b0fbf997e0c00b0f9cf4a078dd7fb