diff --git a/build-and-update-all-branches b/build-and-update-all-branches
deleted file mode 100755
index 1e4b0b4..0000000
--- a/build-and-update-all-branches
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-
-# Prepare rawhide branch, review the list of branches below and then execute this
-# script.
-
-branches='rawhide epel9 epel8 epel7 f34 f35'
-
-exit_handler ()
-{
-    git checkout rawhide
-}
-
-trap exit_handler EXIT
-
-set -e
-set -x
-
-koji hello
-
-tasks=
-for branch in $branches; do
-    if test $branch != rawhide; then
-        git checkout "$branch"
-        git merge rawhide
-    fi
-    git push
-    tasks="${tasks}`fedpkg build --nowait | grep 'Created task' | cut -d: -f2`"
-done
-
-koji watch-task $tasks
-
-git checkout rawhide
-fedpkg update
diff --git a/distgen.spec b/distgen.spec
index e0cd0fd..8f75ee6 100644
--- a/distgen.spec
+++ b/distgen.spec
@@ -1,41 +1,14 @@
-%global pybin %{?fedora:%{__python3}}%{!?fedora:%{__python2}}
-%global pylib %{?fedora:%{python3_sitelib}}%{!?fedora:%{python2_sitelib}}
-%global pypkg %{?fedora:python3}%{!?fedora:python}
-%global meh_pypkg %{?fedora:%{pypkg}-}
-
-%if 0%{?rhel} >= 8
-%global pybin %__python3
-%global pylib %python3_sitelib
-%global pypkg python3
-%global meh_pypkg python3-
-%endif
-
-
 Name:       distgen
 Summary:    Templating system/generator for distributions
-Version:    1.18
+Version:    2.4
 Release:    1%{?dist}
 License:    GPL-2.0-or-later AND Apache-2.0
 URL:        https://github.com/devexp-db/distgen
 BuildArch:  noarch
 
-Requires: %{pypkg}-jinja2
-Requires: %{pypkg}-distro
-Requires: %{meh_pypkg}PyYAML
-Requires: %{pypkg}-six
-
-BuildRequires: make
-BuildRequires: %{pypkg}-devel
-BuildRequires: %{pypkg}-distro
-BuildRequires: %{pypkg}-jinja2
-BuildRequires: %{meh_pypkg}pytest
-%if 0%{?rhel} && 0%{?rhel} < 8
-BuildRequires: %{pypkg}-mock
-BuildRequires: %{pypkg}-pytest-catchlog
-%endif
-BuildRequires: %{meh_pypkg}PyYAML
-BuildRequires: %{pypkg}-setuptools
-BuildRequires: %{pypkg}-six
+BuildRequires: python3-devel
+BuildRequires: pyproject-rpm-macros
+BuildRequires: python3-pytest
 
 Source0: https://pypi.org/packages/source/d/%name/%name-%version.tar.gz
 
@@ -47,33 +20,74 @@ file and preexisting distribution metadata generate output file.
 %prep
 %autosetup -p1
 
+%generate_buildrequires
+%pyproject_buildrequires
+
 
 %build
-%{pybin} setup.py build
+%pyproject_wheel
 
 
 %install
-%{pybin} setup.py install --root=%{buildroot}
-mkdir -p %{buildroot}%{_datadir}/distgen
-mv %{buildroot}%{pylib}/distgen/{distconf,templates} %{buildroot}%{_datadir}/distgen
+%pyproject_install
+%pyproject_save_files distgen
 
 
 %check
-make PYTHON=%{pybin} check
+%pytest tests/unittests/
 
 
-%files
+%files -f %{pyproject_files}
 %license LICENSE
-%doc AUTHORS NEWS
+%doc NEWS
 %doc docs/
 %{_bindir}/dg
-%{pylib}/distgen
-%{pylib}/%{name}-*.egg-info
-%{_datadir}/%{name}
 %{_mandir}/man1/*
 
 
 %changelog
+* Wed Aug 26 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 2.4-1
+- Update to v2.4
+
+* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 2.2-4
+- Rebuilt for Python 3.15
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Mon Dec 29 2025 Pavel Raiskup <praiskup@redhat.com> - 2.2-1
+- new upstream release with F43 config
+
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 2.1-6
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 2.1-5
+- Rebuilt for Python 3.14.0rc2 bytecode
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 2.1-3
+- Rebuilt for Python 3.14
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Tue Jan 14 2025 Ales Nezbeda <anezbeda@redhat.com> - 2.1-1
+- Update to 2.1
+- Support for RHEL 10
+
+* Wed Oct 2 2024 Ales Nezbeda <anezbeda@redhat.com> - 2.0-1
+- Update to 2.0
+- Refresh of build system
+- Change spec file so it follows fedora guidelines
+
 * Mon Sep 09 2024 Lumír Balhar <lbalhar@redhat.com> - 1.18-1
 - Update to 1.18
 
diff --git a/sources b/sources
index 31cfbee..09c25cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (distgen-1.18.tar.gz) = ddc1c5b95e3c905eef851b550aa981a86d58e64d17f383807a000c83fc0fccd77d6095607d128d938708decbae3947d43eaf95dcff9b6bb4f4827318add55b58
+SHA512 (distgen-2.4.tar.gz) = 18108e71463ea76844a79bd2478b4d1892e7b9779542ac1795e57d4ea3f9fbc33f5a5582493d0b33f16dfc2bb4ff0ab2f73e955a3052521af09472e6889f266b