diff --git a/0001-Use-python3-explicitly.patch b/0001-Use-python3-explicitly.patch
deleted file mode 100644
index 9d432b1..0000000
--- a/0001-Use-python3-explicitly.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 77c42fd9e22797c4f04c8097372c4348e1c903b0 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 4 Apr 2018 11:15:40 +1000
-Subject: [PATCH libevdev] Use python3 explicitly
-
-https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
----
- libevdev/make-event-names.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py
-index 44e1685..f100bbe 100755
---- a/libevdev/make-event-names.py
-+++ b/libevdev/make-event-names.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- # Parses linux/input.h scanning for #define KEY_FOO 134
- # Prints C header files or Python files that can be used as
- # mapping and lookup tables.
--- 
-2.14.3
-
diff --git a/libevdev.spec b/libevdev.spec
index f35a909..f2b57b6 100644
--- a/libevdev.spec
+++ b/libevdev.spec
@@ -1,6 +1,6 @@
 Name:           libevdev
 Version:        1.5.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Kernel Evdev Device Wrapper Library
 
 Group:          System Environment/Libraries
@@ -8,10 +8,9 @@ License:        MIT
 URL:            http://www.freedesktop.org/wiki/Software/libevdev
 Source0:        http://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz
 
-Patch01:        0001-Use-python3-explicitly.patch
-
+BuildRequires:  git-core
 BuildRequires:  automake libtool
-BuildRequires:  python3
+BuildRequires:  python3 python3-devel
 
 %description
 %{name} is a library to wrap kernel evdev devices and provide a proper API
@@ -32,7 +31,9 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 Utilities to handle and/or debug evdev devices.
 
 %prep
-%autosetup -p1
+%autosetup -S git
+# Replace whatever the source uses with the approved call
+pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python.*')
 
 %build
 autoreconf --force -v --install || exit 1
@@ -66,6 +67,10 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_bindir}/libevdev-tweak-device
 
 %changelog
+* Thu Jul 12 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.5.9-4
+- Replace all python3 calls with the rpm macro
+- Switch to autosetup git to match other packages
+
 * Wed Apr 04 2018 Peter Hutterer <peter.hutterer@redhat.com> 1.5.9-3
 - Use python3 instead of python2
 - use autosetup