diff --git a/python-xapp.spec b/python-xapp.spec
index a1310da..613c639 100644
--- a/python-xapp.spec
+++ b/python-xapp.spec
@@ -16,69 +16,39 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-xapp
 Version:        1.0.0
 Release:        0
-Summary:        XApp library and common files
+Summary:        Python XApp library
 License:        GPL-2.0+
 Group:          Development/Languages/Python
 Url:            https://github.com/linuxmint/python-xapp
 Source:         https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-BuildRequires:  python-devel
-BuildRequires:  python3-devel
+BuildRequires:  %{python_module devel}
+BuildRequires:  python-rpm-macros
+Requires:       python-psutil
 BuildArch:      noarch
 
 %description
 This project gathers the components which are common to multiple
 desktop environments and required to implement cross-DE solutions.
 
-%package -n python2-xapp
-Summary:        Python 2 XApp library
-Group:          Development/Languages/Python
-%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120200
-Requires:       python2-psutil
-%else
-Requires:       python-psutil
-%endif
-
-%description -n python2-xapp
-This package contains the Python 2 version of the library.
-
-%package -n python3-xapp
-Summary:        Python 3 XApp library
-Group:          Development/Languages/Python
-Requires:       python3-psutil
-
-%description -n python3-xapp
-This package contains the Python 3 version of the library.
+%python_subpackages
 
 %prep
 %setup -q
 
 %build
-for py in python2 python3; do
-    $py setup.py build
-    mv build build-$py
-done
+%python_build
 
 %install
-for py in python2 python3; do
-    mv build-$py build
-    $py setup.py install \
-      --root=%{buildroot} --prefix=%{_prefix}
-    mv build build-$py
-done
+%python_install
 
-%files -n python2-xapp
+%files %{python_files}
 %defattr(-,root,root)
 %doc COPYING debian/changelog
 %{python_sitelib}/xapp/
 %{python_sitelib}/python_xapp-%{version}-*.egg-info
 
-%files -n python3-xapp
-%defattr(-,root,root)
-%doc COPYING debian/changelog
-%{python3_sitelib}/xapp/
-%{python3_sitelib}/python_xapp-%{version}-*.egg-info
-
 %changelog