diff --git a/.gitignore b/.gitignore
index 9b6fc99..a49edd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
-e2tools-0.0.16.tar.gz
+/.build-*.log
+/*.src.rpm
+/e2tools-0.0.*.tar.gz
+/e2tools-0.0.*/
+/results_e2tools/
+/x86_64/
diff --git a/e2tools.spec b/e2tools.spec
index fe7dc9e..ee9ba3e 100644
--- a/e2tools.spec
+++ b/e2tools.spec
@@ -1,13 +1,16 @@
 Name:           e2tools
-Version:        0.0.16
+Version:        0.0.16.4
 Release:        31%{?dist}
 Summary:        Manipulate files in unmounted ext2/ext3 filesystems
 
 Group:          Applications/System
 # No version specified.
 License:        GPL+
-URL:            http://home.earthlink.net/~k_sheff/sw/e2tools/
-Source0:        http://home.earthlink.net/~k_sheff/sw/e2tools/e2tools-0.0.16.tar.gz
+# URL:            http://home.earthlink.net/~k_sheff/sw/e2tools/
+# Source0:        http://home.earthlink.net/~k_sheff/sw/e2tools/e2tools-0.0.16.tar.gz
+URL:            https://github.com/ndim/e2tools
+# curl -L -o e2tools-0.0.16.4.tar.gz https://github.com/ndim/e2tools/archive/v0.0.16.4.tar.gz
+Source0:        https://github.com/ndim/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        e2tools-test.sh
 # Thank you very much for the man pages from Debian package.
 Source2:        e2cp.1
@@ -18,13 +21,15 @@ Source6:        e2mv.1
 Source7:        e2rm.1
 Source8:        e2tail.1
 Source9:        e2tools.7
-Patch1:         e2tools-fedora-fixes.patch
-Patch2:         e2tools-printf-lld-64bit.patch
 
 BuildRequires:  gcc
 BuildRequires:  e2fsprogs-devel >= 1.27
 BuildRequires:  libcom_err-devel
 
+# Yes, really. The tarball from github needs an autoreconf run first.
+BuildRequires:  autoconf
+BuildRequires:  automake
+
 # For e2tools-test.sh
 BuildRequires:  e2fsprogs, diffutils
 
@@ -42,11 +47,10 @@ The utilities are: e2cp e2ln e2ls e2mkdir e2mv e2rm e2tail
 
 %prep
 %setup -q
-%patch1 -p1 -b .fedora-fixes
-%patch2 -p1 -b .printf-lld-64bit
 
 
 %build
+autoreconf -vis .
 %configure
 %{__make} %{?_smp_mflags} CPPFLAGS="-Wall -Werror"
 
@@ -97,6 +101,9 @@ sh %{SOURCE1}
 
 
 %changelog
+* Tue Jan  8 2019 Hans Ulrich Niedermann <hun@n-dimensional.de> - 0.0.16.4-31
+- Update to e2tools-0.0.16.4
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.16-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 56e5ded..3e67f36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1829b2b261e0e0d07566066769b5b28b  e2tools-0.0.16.tar.gz
+SHA512 (e2tools-0.0.16.4.tar.gz) = 35bda0005d0ba4d9541eabf45bd9bed0e7e85144dce88c3bd8afd8eb5ed5db610bc5654aee82978b2a4955d363fd5af4ff40667fa8001955267c96cb84e6792b