diff --git a/libqmi.changes b/libqmi.changes
index 31d0898..9cb55ba 100644
--- a/libqmi.changes
+++ b/libqmi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov  2 09:15:39 UTC 2017 - mpluskal@suse.com
+
+- Do not rely on env for python during build
+- Run spec-cleaner
+
 -------------------------------------------------------------------
 Wed May 10 18:03:59 UTC 2017 - zaitor@opensuse.org
 
diff --git a/libqmi.spec b/libqmi.spec
index c620c6e..c957269 100644
--- a/libqmi.spec
+++ b/libqmi.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libqmi
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands.
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,23 +17,24 @@
 #
 
 
-Name:           libqmi
 %define _soname libqmi-glib5
+Name:           libqmi
 Version:        1.18.0
 Release:        0
 # NOTE: The file headers state LESSER GPL, which is a mistake. The upstream intended license is LIBRARY GPL 2.0+
 Summary:        Library to control QMI devices
-License:        LGPL-2.1+ and GPL-2.0+
+License:        LGPL-2.1+ AND GPL-2.0+
 Group:          Hardware/Modem
-Url:            http://cgit.freedesktop.org/libqmi/
+URL:            http://cgit.freedesktop.org/libqmi/
 Source0:        http://www.freedesktop.org/software/libqmi/%{name}-%{version}.tar.xz
 Source99:       libqmi-rpmlintrc
+BuildRequires:  python3
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.36
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gudev-1.0) >= 147
 BuildRequires:  pkgconfig(mbim-glib) >= 1.14
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 libqmi is a glib-based library for talking to WWAN modems and devices
@@ -73,20 +74,20 @@ This package contains files required to link sources against libqmi.
 %setup -q
 
 %build
+# Do not rely on env for choosing python
+sed -i "s|env python|python3|g" build-aux/qmi-codegen/*
 %configure \
-    --disable-static
+  --disable-static
 make %{?_smp_mflags}
 
 %install
 %make_install
-find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %post -n %{_soname} -p /sbin/ldconfig
-
 %postun -n %{_soname} -p /sbin/ldconfig
 
 %files tools
-%defattr(-,root,root)
 %doc COPYING
 %{_bindir}/qmi-network
 %{_bindir}/qmicli
@@ -101,12 +102,10 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
 %{_mandir}/man1/qmi-firmware-update.1%{?ext_man}
 
 %files -n %{_soname}
-%defattr(-,root,root)
 %doc COPYING.LIB
 %{_libdir}/libqmi-glib.so.*
 
 %files devel
-%defattr(-,root,root)
 %{_datadir}/gtk-doc/html/libqmi-glib/
 %{_includedir}/libqmi-glib/
 %{_libdir}/libqmi-glib.so