diff --git a/python-sip.spec b/python-sip.spec
index 0c06960..9e26378 100644
--- a/python-sip.spec
+++ b/python-sip.spec
@@ -1,14 +1,16 @@
+%define pkgname %(echo %name | cut -d- -f2- | tr - _)
 Name:          python-sip
-Version:       6.8.3
+Version:       6.8.6
 Release:       1mamba
 Summary:       Python extension module generator for C and C++ libraries
 Group:         System/Libraries/Python
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           https://www.riverbankcomputing.com/software/sip
-Source:        https://pypi.debian.net/sip/sip-%{version}.tar.gz
-License:       GPL
+URL:           https://github.com/Python-SIP/sip
+Source:        https+git://github.com/Python-SIP/sip.git/%{version}/sip-%{version}.tar.bz2
+#Source:        https://pypi.debian.net/sip/sip-%{version}.tar.gz
+License:       BSD
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: libpython311-devel
 BuildRequires: python3.11dist(packaging)
@@ -37,37 +39,20 @@ Obsoletes:     sip < 6.5.1-2mamba
 %setup -q -n sip-%{version}
 
 %build
-CFLAGS="%{optflags}" %{__python} setup.py build
+CFLAGS="%{optflags}" %{__python} -m build --no-isolation --wheel
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%{__python} setup.py install \
-   -O1 --skip-build \
-   --root="%{buildroot}" \
-   --install-headers=%{python_inc} \
-   --install-lib=%{python_sitearch} \
-   --record=%{name}.filelist
+%{__python} -m installer --destdir=%{buildroot} dist/*.whl
 
-sed -i "\,\.egg-info/,d;s,.*/man/.*,&.gz," %{name}.filelist
+#%if "%{?with_pyver}" != "3"
+## Rename any conflicting file outside of python site packages tree
+#for f in %{_bindir}/pdm; do
+#   mv %{buildroot}${f}{,-%{?pyappend}}
+#done
+#%endif
 
-sed -i "/^\/usr\/bin/d" %{name}.filelist
-
-for f in build distinfo install module sdist wheel; do
-   mv %{buildroot}%{_bindir}/sip-${f} %{buildroot}%{_bindir}/sip-${f}-py%{with_pyver}
-%if "%{?with_pyver}" == "3"
-   ln -s sip-${f}-py%{with_pyver} %{buildroot}%{_bindir}/sip-${f}
-%endif
-done
-
-%clean
-[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-
-%posttrans %{?with_pyver:py%{pyver}}
-# cleanup of empty egg-info dirs
-find %{python_sitearch}/*.egg-info -type d -empty -delete > /dev/null || true
-:
-
-%files %{?with_pyver:py%{pyver}} -f %{name}.filelist
+%files %{?pyappend}
 %defattr(-,root,root)
 %{_bindir}/sip-build*
 %{_bindir}/sip-distinfo*
@@ -75,11 +60,16 @@ find %{python_sitearch}/*.egg-info -type d -empty -delete > /dev/null || true
 %{_bindir}/sip-module*
 %{_bindir}/sip-sdist*
 %{_bindir}/sip-wheel*
-%dir %{python_sitearch}/sip-%{version}-py*.egg-info
-%{python_sitearch}/sip-%{version}-py*.egg-info/*
-%doc LICENSE LICENSE-GPL2 LICENSE-GPL3
+%dir %{python_sitelib}/%{pkgname}-%{version}.dist-info
+%{python_sitelib}/%{pkgname}-%{version}.dist-info/*
+%dir %{python_sitelib}/sipbuild
+%{python_sitelib}/sipbuild/*
+%doc LICENSE
 
 %changelog
+* Sun Jul 21 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.8.6-1mamba
+- update to 6.8.6
+
 * Sat Feb 10 2024 Automatic Build System <autodist@openmamba.org> 6.8.3-1mamba
 - automatic version update by autodist