diff --git a/.gitignore b/.gitignore
index 71b035a..a0c60c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1 @@
-/dist-git-0.10.tar.gz
-/dist-git-0.11.tar.gz
-/dist-git-1.0.tar.gz
-/dist-git-1.1.tar.gz
-/dist-git-1.2.tar.gz
-/dist-git-1.3.tar.gz
-/dist-git-1.4.tar.gz
-/dist-git-1.5.tar.gz
-/dist-git-1.6.tar.gz
-/dist-git-1.7.tar.gz
-/dist-git-1.8.tar.gz
-/dist-git-1.9.tar.gz
-/dist-git-1.10.tar.gz
-/dist-git-1.11.tar.gz
-/dist-git-1.12.tar.gz
-/dist-git-1.13.tar.gz
-/dist-git-1.14.tar.gz
-/dist-git-1.15.tar.gz
-/dist-git-1.16.tar.gz
+/dist-git-*.tar.gz
diff --git a/dist-git.spec b/dist-git.spec
index acb23c7..80f2608 100644
--- a/dist-git.spec
+++ b/dist-git.spec
@@ -3,12 +3,12 @@
 %global installdir /var/lib/dist-git
 
 Name:           dist-git
-Version:        1.16
-Release:        3%{?dist}
+Version:        1.18
+Release:        1%{?dist}
 Summary:        Package source version control system
 
 # upload.cgi uses GPLv1
-License:        MIT and GPLv1
+License:        MIT AND GPL-1.0-only
 URL:            https://github.com/release-engineering/dist-git
 # Source is created by
 # git clone https://github.com/release-engineering/dist-git.git
@@ -21,44 +21,35 @@ BuildRequires:  systemd
 
 Requires:       httpd
 Requires:       perl(Sys::Syslog)
-%if 0%{?fedora} || 0%{?rhel} > 7
 Requires:       (dist-git-selinux if selinux-policy-targeted)
-%else
-Requires:       dist-git-selinux
-%endif
 Requires:       git
 Requires:       git-daemon
 Requires:       mod_ssl
 Requires:       crudini
 Requires(pre):  shadow-utils
 
-%if 0%{?rhel} && 0%{?rhel} < 8
-Requires:       python-requests
-Requires:       python-configparser
-Requires:       python-grokmirror
-Requires:       fedmsg
-BuildRequires:  python-nose
-BuildRequires:  python-nose-parameterized
-BuildRequires:  python-requests
-BuildRequires:  python-configparser
-
-# temporary because global Requires doesn't work right now, see the comment below
-Requires:       moreutils
-
-%else
 Requires:       python3-requests
 Recommends:     python3-grokmirror
 Suggests:       python3-fedmsg
 Suggests:       fedora-messaging
+%if 0%{?rhel} == 8
 BuildRequires:  python3-nose
+%else
+BuildRequires:  python3-pytest
+%endif
 BuildRequires:  python3-parameterized
 BuildRequires:  python3-requests
 
 # this should be Requires but see https://bugzilla.redhat.com/show_bug.cgi?id=1833810
 Recommends: moreutils
 
+%if 0%{?fedora} && 0%{?fedora} >= 41
+# The `cgi` module was removed from the Python 3.13 standard library
+BuildRequires:  python3-legacy-cgi
+Requires:       python3-legacy-cgi
 %endif
 
+
 %description
 DistGit is a Git repository specifically designed to hold RPM
 package sources.
@@ -68,16 +59,11 @@ package sources.
 Summary:        SELinux support for dist-git
 
 BuildRequires:  checkpolicy
-BuildRequires:  policycoreutils
-BuildRequires:  selinux-policy-devel
 BuildRequires:  hardlink
 
 Requires:       %name = %version-%release
-%if "%{_selinux_policy_version}" != ""
-Requires:       selinux-policy >= %{_selinux_policy_version}
-%endif
-Requires(post):   /usr/sbin/semodule, /sbin/restorecon
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+BuildRequires:  selinux-policy-devel
+%{?selinux_requires}
 
 
 %description selinux
@@ -115,11 +101,15 @@ exit 0
 
 
 %check
-#%if 0%{?rhel} && 0%{?rhel} < 8
-#nosetests .
-#%else
-#nosetests-3 .
-#%endif
+%if 0%{?rhel} && 0%{?rhel} <= 8
+%if 0%{?rhel} < 8
+nosetests -v .
+%else
+nosetests-3 -v .
+%endif
+%else
+pytest -vv .
+%endif
 
 
 %install
@@ -250,19 +240,33 @@ fi
 
 %dir              %{_datadir}/dist-git
 %attr (775, -, -) %{_datadir}/dist-git/*
+%{_bindir}/dist-git-gc
+# TODO: move _datadir executables to _libexecdir, and drop these symlinks
+%{_bindir}/mkbranch
+%{_bindir}/mkbranch_branching
+%{_bindir}/remove_unused_sources
+%{_bindir}/setup_git_package
 
 
 %files selinux
 %doc selinux/*
 %{_datadir}/selinux/*/%{modulename}.pp
-%{_bindir}/*
+
 
 %changelog
-* Mon Oct 5 2020 clime <clime@fedoraproject.com> - 1.16-3
-- return back 1.16-1 state
+* Fri Sep 27 2024 Pavel Raiskup <praiskup@redhat.com> 1.18-1
+- replace test on _selinux_policy_version by macro that does it all
+- handle situation when _selinux_policy_version is not defined
+- silence pylint
+- remove rhel7 specific code
+- Move %%_bindir symlinks out from dist-git-selinux
+- Depend on python3-legacy-cgi for F41+
+- licensing: update the project's COPYING file
+- dist-git: move the code into sub-directory
 
-* Mon Oct 5 2020 clime <clime@fedoraproject.com> - 1.16-2
-- use simpler dist-git-selinux require due to build-system problem
+* Wed Jan 04 2023 Miroslav Suchý <msuchy@redhat.com> 1.17-1
+- use spdx license
+- use pytest instead of nose test
 
 * Mon Oct 5 2020 clime <clime@fedoraproject.com> - 1.16-1
 - fixed exceptions for fedora-messaging
diff --git a/packit.yaml b/packit.yaml
new file mode 100644
index 0000000..0b8d165
--- /dev/null
+++ b/packit.yaml
@@ -0,0 +1,24 @@
+upstream_project_url: https://github.com/release-engineering/dist-git
+upstream_tag_template: dist-git-{version}-1
+issue_repository: https://github.com/release-engineering/dist-git
+copy_upstream_release_description: false
+
+jobs:
+- job: pull_from_upstream
+  trigger: release
+  dist_git_branches:
+    - rawhide
+    - epel9
+
+- job: koji_build
+  trigger: commit
+  allowed_committers: ['packit']
+  dist_git_branches:
+    - fedora-all
+    - epel9
+
+- job: bodhi_update
+  trigger: commit
+  dist_git_branches:
+    - fedora-all
+    - epel9
diff --git a/sources b/sources
index d06935c..812f1eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dist-git-1.16.tar.gz) = eabea892357ca9fbe63fef19e6439ff6f91c6b20f1c31a5dd567bf405b9024b06c2e199e5ff2594969958e92d413e4f400e0df462a9c865e955eb51915db599f
+SHA512 (dist-git-1.18.tar.gz) = f3c4caa189589d9211fe37703d9eee0b7f03705536d598a955280ef4477095eeb1323c96c550f0b2a951b74c99fcd51b496c47e291c8658192c097d8bae0872d