diff --git a/.gitignore b/.gitignore
index 9765896..0c92048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /abootimg-0.6-20110830gitff8e759.tar.gz
+/abootimg-0.6-7e127fe.tar.gz
diff --git a/abootimg.spec b/abootimg.spec
index 9c0c93f..435b68a 100644
--- a/abootimg.spec
+++ b/abootimg.spec
@@ -1,17 +1,20 @@
+%global codate 20230721
+%global commit0 7e127fee6a3981f6b0a50ce9910267cd501e09d4
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
 %global gitrev ff8e759
 %global checkout 20110830git%{gitrev}
 
 Name:           abootimg
 Version:        0.6
-Release:        4.%{checkout}%{?dist}
+Release:        %autorelease -s %{codate}git%{shortcommit0}
 Summary:        Tool for manipulating Android boot images
 
-License:        GPLv2+
-URL:            https://gitorious.org/ac100/abootimg
-# git clone git://gitorious.org/ac100/abootimg.git
-# cd abootimg ; git archive --format=tar --prefix=abootimg-%%{version}-%%{checkout}/ %%{gitrev} | gzip > abootimg-%%{version}-%%{checkout}.tar.gz
-Source0:        abootimg-%{version}-%{checkout}.tar.gz
+License:        GPL-2.0-or-later
+URL:            https://github.com/ggrandou/abootimg
+Source0:        https://github.com/ggrandou/abootimg/archive/%{commit0}.tar.gz#/%{name}-%{version}-%{shortcommit0}.tar.gz
 
+BuildRequires:  gcc
 BuildRequires:  libblkid-devel
 
 %description
@@ -20,7 +23,7 @@ partition format defined by the Android Open Source Project.
 
 
 %prep
-%setup -q -n abootimg-%{version}-%{checkout}
+%autosetup -p1 -n %{name}-%{commit0}
 
 
 %build
@@ -34,21 +37,11 @@ install -D -m 644 -p debian/abootimg.1 ${RPM_BUILD_ROOT}/%{_mandir}/man1/abootim
 
 
 %files
+%doc Changelog README
+%license LICENSE
 %{_bindir}/abootimg
 %{_mandir}/man1/*
-%doc Changelog LICENSE README
-
 
 
 %changelog
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6-4.20110830gitff8e759
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Nov 23 2011 Yanko Kaneti <yaneti@declera.com> 0.6-3.20110830gitff8e759
-- Preserve man page timestamp on install.
-
-* Wed Nov 16 2011 Yanko Kaneti <yaneti@declera.com> 0.6-2.20110830gitff8e759
-- Fixed a typo pointed by the first review.
-
-* Tue Aug 30 2011 Yanko Kaneti <yaneti@declera.com> 0.6-1.20110830gitff8e759
-- Attempt at packaging.
+%autochangelog
diff --git a/sources b/sources
index 9bb6ec9..2430a26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5c2a7abdbcf5f95bd8ee21a5223f43b  abootimg-0.6-20110830gitff8e759.tar.gz
+SHA512 (abootimg-0.6-7e127fe.tar.gz) = 4e9be4394d767c6ca02bad8c8590a028de0c2eff9100b906b2e2f995a1aa5556c41c964ad77ce996002fb8b35d9188ca548649301ad89448698cce600e97828e