diff --git a/python-rpm.changes b/python-rpm.changes
index aca340c..724aedc 100644
--- a/python-rpm.changes
+++ b/python-rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 20 13:59:45 UTC 2018 - tchvatal@suse.com
+
+- Switch really to singlespec thus allowing us to build without
+  python2-devel present in the distribution
+
 -------------------------------------------------------------------
 Wed Jan 31 14:45:33 CET 2018 - mls@suse.de
 
diff --git a/python-rpm.spec b/python-rpm.spec
index 2915945..eac0b12 100644
--- a/python-rpm.spec
+++ b/python-rpm.spec
@@ -17,14 +17,16 @@
 #
 
 
+# Enable Python build sourced from rpm spec
+%global with_python 1
 Name:           python-rpm
 Version:        4.14.1
 Release:        0
-#!BuildIgnore:  rpmlint-Factory
 Summary:        Python Bindings for Manipulating RPM Packages
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Libraries/Python
 Source99:       rpm.spec
+BuildRequires:  %{python_module devel}
 BuildRequires:  file-devel
 BuildRequires:  libacl-devel
 BuildRequires:  libbz2-devel
@@ -37,22 +39,15 @@ BuildRequires:  lua-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  popt-devel
 BuildRequires:  python-rpm-macros
-BuildRequires:  python2-devel
-BuildRequires:  python3-devel
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
+#!BuildIgnore:  rpmlint-Factory
 Requires:       rpm = %{version}
-
+%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%{_sourcedir}/rpm.spec)}
 %if "%{python_flavor}" == "python2"
 Obsoletes:      rpm-python < %{version}-%{release}
 Provides:       rpm-python = %{version}-%{release}
 %endif
-
-# Enable Python build sourced from rpm spec
-%global with_python 1
-
-%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%_sourcedir/rpm.spec)}
-
 %python_subpackages
 
 %description
@@ -64,7 +59,7 @@ This package should be installed if you want to develop Python programs
 that will manipulate RPM packages and databases.
 
 %prep
-%{expand:%(sed -n -e '/^%%prep/,/^%%install/p' <%_sourcedir/rpm.spec | sed -e '1d' -e '$d')}
+%{expand:%(sed -n -e '/^%%prep/,/^%%install/p' <%{_sourcedir}/rpm.spec | sed -e '1d' -e '$d')}
 
 # The build stage is already declared and pulled in from rpm.spec
 pushd python
diff --git a/rpm.spec b/rpm.spec
index 1e2faa3..4d6a1ae 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -49,7 +49,7 @@ BuildRequires:  zlib-devel
 Provides:       rpminst
 Requires(post): %fillup_prereq
 Summary:        The RPM Package Manager
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Packages
 Version:        4.14.1
 Release:        0