diff --git a/python-argcomplete.spec b/python-argcomplete.spec
index d2c0fee..4a90d42 100644
--- a/python-argcomplete.spec
+++ b/python-argcomplete.spec
@@ -1,5 +1,6 @@
+%define pkgname %(echo %name | cut -d- -f2- | tr - _)
 Name:          python-argcomplete
-Version:       3.5.2
+Version:       3.5.3
 Release:       1mamba
 Summary:       Easy, extensible command line tab completion of arguments for your Python script
 Group:         System/Libraries
@@ -9,9 +10,9 @@ Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://pypi.org/project/argcomplete/
 Source:        https://pypi.debian.net/argcomplete/argcomplete-%{version}.tar.gz
 License:       Apache License 2.0
+BuildArch:     noarch
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: libpython311-devel
-BuildRequires: python3.11dist(setuptools)
 ## AUTOBUILDREQ-END
 
 %description
@@ -23,28 +24,35 @@ BuildRequires: python3.11dist(setuptools)
 
 %prep
 %setup -q -n argcomplete-%{version}
-sed -i "s|, < 6||" setup.py
 
 %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
 
-%files %{?pyappend} -f %{name}.filelist
+%files %{?pyappend}
 %defattr(-,root,root)
-%dir %{python_sitearch}/argcomplete-%{version}-py*.egg-info
-%{python_sitearch}/argcomplete-%{version}-py*.egg-info/*
+%{_bindir}/activate-global-python-argcomplete*
+%{_bindir}/python-argcomplete-check-easy-install-script*
+%{_bindir}/register-python-argcomplete*
+%dir %{python_sitelib}/%{pkgname}-%{version}.dist-info
+%{python_sitelib}/%{pkgname}-%{version}.dist-info/*
+%dir %{python_sitelib}/%{pkgname}
+%{python_sitelib}/%{pkgname}/*
 
 %changelog
+* Sat Jan 04 2025 Automatic Build System <autodist@openmamba.org> 3.5.3-1mamba
+- automatic version update by autodist
+
 * Sat Dec 07 2024 Automatic Build System <autodist@openmamba.org> 3.5.2-1mamba
 - automatic version update by autodist