diff --git a/python-dbus.spec b/python-dbus.spec
index af94f07..c45531e 100644
--- a/python-dbus.spec
+++ b/python-dbus.spec
@@ -1,70 +1,57 @@
 Name:          python-dbus
 Version:       1.2.16
-Release:       1mamba
+Release:       2mamba
 Summary:       D-Bus python bindings for use with python programs
 Group:         System/Libraries/Python
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://www.freedesktop.org/software/dbus/
-Source:        http://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar.gz
+URL:           https://www.freedesktop.org/software/dbus/
+Source:        https://pypi.debian.net/dbus-python/dbus-python-%{version}.tar.gz
+#Source:        http://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar.gz
 License:       GPL, Academic Free License
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
 BuildRequires: libdbus-devel
-BuildRequires: libdbus-glib-devel
 BuildRequires: libglib-devel
-BuildRequires: libpython-devel
+BuildRequires: libsystemd-devel
 ## AUTOBUILDREQ-END
-BuildRequires: libpython3-devel >= 3.7.4
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-Provides:      dbus-python
-Obsoletes:     dbus-python
 
 %description
 D-Bus python bindings for use with python programs.
 
-%if "%?with_pyver"
-%define pyver           %{with_pyver}
-%define __python        %(rpm --eval %{__python%{with_pyver}})
-%define python_sitearch %(rpm --eval %{python%{with_pyver}_sitearch})
-%define python_sitelib  %(rpm --eval %{python%{with_pyver}_sitelib})
-%define python_inc      %(rpm --eval %{python%{with_pyver}_inc})
-%define python_version  %(rpm --eval %{python%{with_pyver}_version})
-%define python_provides %(rpm --eval %{python%{with_pyver}_provides})
-%define python_requires %(rpm --eval %{python%{with_pyver}_requires})
-%define py_requires     %(rpm --eval %{py%{with_pyver}_requires})
-
-%package py%{pyver}
-Group:         System/Libraries/Python
-Summary:       D-Bus python bindings for use with python programs
-%py_requires
-
-%description py%{pyver}
-D-Bus python bindings for use with python programs.
-%endif
-
 %package devel
 Summary:       Devel package for %{name}
 Group:         Development/Libraries
 #Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 Provides:      dbus-python-devel
-Obsoletes:     dbus-python-devel
+Obsoletes:     dbus-python-devel < 1.2.16-1mamba
 
 %description devel
 D-Bus python bindings for use with python programs.
 This package contains static libraries and header files need for development.
 
+%if 0%{?with_pyver}
+%pyver_package
+%endif
+
 %prep
 %setup -q -n dbus-python-%{version}
+#%ifarch x86_64 aarch64
+#sed -i "s|/lib/python|/lib64/python|" configure
+#%endif
 
 %build
-%configure PYTHON=%{__python}
+%configure \
+   PYTHON=%{__python} \
+   --disable-documentation
+
 %make
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall
+%make_install \
+   pythondir=%{python_sitearch}
 
 #remove unpackaged files
 rm -rf %{buildroot}%{_datadir}/doc/dbus-python
@@ -72,16 +59,14 @@ rm -rf %{buildroot}%{_datadir}/doc/dbus-python
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-%if "%?with_pyver"
-%files py%{pyver}
-%else
-%files
-%endif
+%files %{?pyappend}
 %defattr(-,root,root)
-%{python_sitearch}/*
-%ifarch x86_64 aarch64
-%{python_sitelib}/*
-%endif
+%dir %{python_sitearch}/dbus
+%{python_sitearch}/dbus/*
+%{python_sitearch}/_dbus_bindings.la
+%{python_sitearch}/_dbus_bindings.so
+%{python_sitearch}/_dbus_glib_bindings.la
+%{python_sitearch}/_dbus_glib_bindings.so
 %doc AUTHORS COPYING
 
 %files devel
@@ -92,6 +77,9 @@ rm -rf %{buildroot}%{_datadir}/doc/dbus-python
 %doc ChangeLog NEWS README doc/*.txt
 
 %changelog
+* Sat Mar 27 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2.16-2mamba
+- x86_64, aarch64: rebuilt in python_sitearch
+
 * Sun Feb 02 2020 Automatic Build System <autodist@mambasoft.it> 1.2.16-1mamba
 - automatic version update by autodist