diff --git a/fedora-messaging.spec b/fedora-messaging.spec
index 757229d..366e3f6 100644
--- a/fedora-messaging.spec
+++ b/fedora-messaging.spec
@@ -7,26 +7,27 @@ Tools and APIs to make working with AMQP in Fedora easier.
 
 Name:           %{pkgname}
 Version:        3.4.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Set of tools for using Fedora's messaging infrastructure
 
 License:        GPLv2+
 URL:            https://github.com/fedora-infra/fedora-messaging
-Source0:        %{pypi_source}
+Source0:        fedora_messaging-3.4.1.tar.gz
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
 BuildRequires:  python3-blinker
 BuildRequires:  python3-click
 BuildRequires:  python3-crochet
-BuildRequires:  python3-jsonschema
-BuildRequires:  python3-toml
-BuildRequires:  python3-twisted
-BuildRequires:  python3-pytz
-BuildRequires:  python3-pyOpenSSL
+BuildRequires:  python3-jsonchema
 BuildRequires:  python3-pika
+BuildRequires:  python3-pyOpenSSL
+BuildRequires:  python3-pytz
 BuildRequires:  python3-service-identity
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-toml
+BuildRequires:  python3-twisted
+
 # For testing
 BuildRequires:  python3-pytest
 #BuildRequires:  python3-pytest-twisted
@@ -51,11 +52,13 @@ Documentation for %{pkgname}.
 
 
 %prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -n fedora_messaging-3.4.1
 
+%generate_buildrequires
+%pyproject_buildrequires
 
 %build
-%py3_build
+%pyproject_wheel
 # generate docs
 PYTHONPATH=${PWD} sphinx-build-3 -M html -d docs/_build/doctrees docs docs/_build/html
 PYTHONPATH=${PWD} sphinx-build-3 -M man -d docs/_build/doctrees docs docs/_build/man
@@ -64,27 +67,22 @@ rm -rf docs/_build/*/.buildinfo
 
 
 %install
-%py3_install
-install -D -p -m 644 config.toml.example $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/config.toml
-install -D -p -m 644 configs/fedora.toml $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/fedora.toml
-install -D -p -m 644 configs/fedora.stg.toml $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/fedora.stg.toml
-install -D -p -m 644 configs/cacert.pem $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/cacert.pem
+%pyproject_install
+%pyproject_save_files %{srcname}
+install -D -p -m 644 config.toml.example %{buildroot}%{_sysconfdir}/fedora-messaging/config.toml
+install -D -p -m 644 configs/fedora.toml %{buildroot}%{_sysconfdir}/fedora-messaging/fedora.toml
+install -D -p -m 644 configs/fedora.stg.toml %{buildroot}%{_sysconfdir}/fedora-messaging/fedora.stg.toml
+install -D -p -m 644 configs/cacert.pem %{buildroot}%{_sysconfdir}/fedora-messaging/cacert.pem
 # Yes, this is supposed to be a world-readable private key. It's for public Fedora broker access.
-install -D -p -m 644 configs/fedora-key.pem $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/fedora-key.pem
-install -D -p -m 644 configs/fedora-cert.pem $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/fedora-cert.pem
-install -D -p -m 644 configs/stg-cacert.pem $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/stg-cacert.pem
-install -D -p -m 644 configs/fedora.stg-key.pem $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/fedora.stg-key.pem
-install -D -p -m 644 configs/fedora.stg-cert.pem $RPM_BUILD_ROOT%{_sysconfdir}/fedora-messaging/fedora.stg-cert.pem
-install -D -p -m 644 docs/_build/man/fedora-messaging.1 $RPM_BUILD_ROOT%{_mandir}/man1/fedora-messaging.1
-install -D -p -m 644 fm-consumer@.service $RPM_BUILD_ROOT%{_unitdir}/fm-consumer@.service
-
-
-%check
-#export PYTHONPATH=.
-#pytest-3 -vv
-
-
-%files
+install -D -p -m 644 configs/fedora-key.pem %{buildroot}%{_sysconfdir}/fedora-messaging/fedora-key.pem
+install -D -p -m 644 configs/fedora-cert.pem %{buildroot}%{_sysconfdir}/fedora-messaging/fedora-cert.pem
+install -D -p -m 644 configs/stg-cacert.pem %{buildroot}%{_sysconfdir}/fedora-messaging/stg-cacert.pem
+install -D -p -m 644 configs/fedora.stg-key.pem %{buildroot}%{_sysconfdir}/fedora-messaging/fedora.stg-key.pem
+install -D -p -m 644 configs/fedora.stg-cert.pem %{buildroot}%{_sysconfdir}/fedora-messaging/fedora.stg-cert.pem
+install -D -p -m 644 docs/_build/man/fedora-messaging.1 %{buildroot}%{_mandir}/man1/fedora-messaging.1
+install -D -p -m 644 fm-consumer@.service %{buildroot}%{_unitdir}/fm-consumer@.service
+
+%files -n %{pkgname} -f %{pyproject_files}
 %license LICENSE
 %doc README.rst
 %dir %{_sysconfdir}/fedora-messaging/
@@ -103,8 +101,6 @@ install -D -p -m 644 fm-consumer@.service $RPM_BUILD_ROOT%{_unitdir}/fm-consumer
 
 %files -n python3-%{pkgname}
 %license LICENSE
-%{python3_sitelib}/%{srcname}
-%{python3_sitelib}/%{srcname}-*.egg-info
 
 %files doc
 %license LICENSE
@@ -112,6 +108,16 @@ install -D -p -m 644 fm-consumer@.service $RPM_BUILD_ROOT%{_unitdir}/fm-consumer
 
 
 %changelog
+* Thu Aug 31 2023 Lenka Segura <lsegura@redhat.com> - 3.4.1-4
+- Move to poetry (Lenka Segura)
+- Dependency management with renovate (Lenka Segura)
+- Auto-update pre-commit hooks (abompard)
+- Allow the CLI to publish messages without specifying the id (Aurélien Bompard)
+- Make sure the msg._properties.priority is not None (Aurélien Bompard)
+- Add gitleaks allow whitelist (Ryan Lerch)
+- RabbitMQ error messages have become more specific (Aurélien Bompard)
+- Auto-update pre-commit hooks (abompard)
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild