diff --git a/PyQt-builder.spec b/PyQt-builder.spec
index 026bf62..d4110ee 100644
--- a/PyQt-builder.spec
+++ b/PyQt-builder.spec
@@ -1,5 +1,6 @@
+%define pkgname %(echo %name | cut -d- -f2- | tr - _)
 Name:          PyQt-builder
-Version:       1.15.4
+Version:       1.16.4
 Release:       1mamba
 Summary:       PEP 517 Compliant PyQt Build System
 Group:         System/Libraries
@@ -7,12 +8,11 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://www.riverbankcomputing.com/software/pyqt/
-Source:        https://pypi.debian.net/PyQt-builder/PyQt-builder-%{version}.tar.gz
+Source:        https://pypi.debian.net/PyQt-builder/pyqt_builder-%{version}.tar.gz
 License:       SIP
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: libpython311-devel
 BuildRequires: python3.11dist(packaging)
-BuildRequires: python3.11dist(setuptools)
 BuildRequires: python3.11dist(sip)
 ## AUTOBUILDREQ-END
 BuildRequires: libpython3-devel >= 3.11.5
@@ -25,40 +25,36 @@ BuildRequires: libpython3-devel >= 3.11.5
 %endif
 
 %prep
-%setup -q
+%setup -q -n pyqt_builder-%{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 bundle qt-wheel; do
-   mv %{buildroot}%{_bindir}/pyqt-${f} %{buildroot}%{_bindir}/pyqt-${f}-py%{with_pyver}
-%if "0%{?with_pyver}" == "03"
-   ln -s pyqt-${f}-py%{with_pyver} %{buildroot}%{_bindir}/pyqt-${f}
-%endif
-done
-
-%files %{?pyappend} -f %{name}.filelist
+%files %{?pyappend}
 %defattr(-,root,root)
 %{_bindir}/pyqt-bundle*
 %{_bindir}/pyqt-qt-wheel*
-%dir %{python_sitearch}/PyQt_builder-%{version}-py*.egg-info
-%{python_sitearch}/PyQt_builder-%{version}-py*.egg-info/*
+%dir %{python3_sitelib}/PyQt_builder-%{version}.dist-info
+%{python3_sitelib}/PyQt_builder-%{version}.dist-info/*
+%dir %{python3_sitelib}/pyqtbuild
+%{python3_sitelib}/pyqtbuild/*
 %doc LICENSE
 
 %changelog
+* Sun Aug 04 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.16.4-1mamba
+- update to 1.16.4
+
 * Fri Dec 01 2023 Automatic Build System <autodist@mambasoft.it> 1.15.4-1mamba
 - automatic version update by autodist