diff --git a/python-sherlock.spec b/python-sherlock.spec
deleted file mode 100644
index 480ccdcc..00000000
--- a/python-sherlock.spec
+++ /dev/null
@@ -1,87 +0,0 @@
-# Package maintained by Paul Pfeister <rh-bugzilla@pfeister.dev> (GitHub @ppfeister)
-%global source_ref master
-%global friendly_name sherlock
-%global pkg_version 0.14.4
-%global pkg_build 1
-
-Name:           python-%{friendly_name}
-Version:        %{pkg_version}
-Release:        %{pkg_build}%{?dist}
-Summary:        Hunt down social media accounts by username across social networks
-
-License:        MIT
-URL:            http://sherlock-project.github.io/
-BugURL:         https://github.com/sherlock-project/sherlock/issues
-Source0:        https://github.com/sherlock-project/sherlock/archive/%{source_ref}.tar.gz
-BuildArch:      noarch
-
-BuildRequires:  python3-devel
-BuildRequires:  python3dist(certifi) >= 2019.6.16
-BuildRequires:  python3dist(colorama) >= 0.4.1
-BuildRequires:  python3dist(exrex) >= 0.11
-BuildRequires:  python3dist(openpyxl) >= 3.0.10
-BuildRequires:  python3dist(pandas) >= 1
-BuildRequires:  python3dist(pysocks) >= 1.7
-BuildRequires:  python3dist(requests) >= 2.22
-BuildRequires:  python3dist(requests-futures) >= 1
-BuildRequires:  python3dist(setuptools)
-BuildRequires:  python3dist(stem) >= 1.8
-BuildRequires:  python3dist(torrequest) >= 0.1
-
-%global _long_description Hunt down social media accounts by username across social networks
-
-
-%description
-%{_long_description}
-
-%package -n     python3-%{friendly_name}
-Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{friendly_name}}
-
-Requires:       python3dist(certifi) >= 2019.6.16
-Requires:       python3dist(colorama) >= 0.4.1
-Requires:       python3dist(exrex) >= 0.11
-Requires:       python3dist(openpyxl) >= 3.0.10
-Requires:       python3dist(pandas) >= 1
-Requires:       python3dist(pysocks) >= 1.7
-Requires:       python3dist(requests) >= 2.22
-Requires:       python3dist(requests-futures) >= 1
-Requires:       python3dist(setuptools)
-Requires:       python3dist(stem) >= 1.8
-Requires:       python3dist(torrequest) >= 0.1
-%description -n python3-%{friendly_name}
-%{_long_description}
-
-
-%prep
-%autosetup -n sherlock-%{source_ref}
-
-%build
-%py3_build
-
-%install
-%py3_install
-
-%check
-cd sherlock
-%{python3} -m unittest tests.all --verbose
-cd ..
-
-%files -n python3-%{friendly_name}
-%license LICENSE
-%doc README.md
-%{_bindir}/sherlock
-%{python3_sitelib}/__init__.py
-%{python3_sitelib}/__main__.py
-%{python3_sitelib}/__pycache__/*
-%{python3_sitelib}/notify.py
-%{python3_sitelib}/result.py
-%{python3_sitelib}/sherlock.py
-%{python3_sitelib}/sites.py
-%{python3_sitelib}/resources
-%{python3_sitelib}/tests
-%{python3_sitelib}/Sherlock-%{pkg_version}-py%{python3_version}.egg-info
-
-%changelog
-* Sun May 12 2024 Paul Pfeister - 0.14.4
-- Initial package.
diff --git a/sherlock-project.spec b/sherlock-project.spec
new file mode 100644
index 00000000..a47b3d3e
--- /dev/null
+++ b/sherlock-project.spec
@@ -0,0 +1,53 @@
+# Packager: Paul Pfeister <rh-bugzilla@pfeister.dev> (GitHub @ppfeister)
+%global source_ref master
+
+Name:           sherlock-project
+Version:        0.14.4
+Release:        %autorelease
+Summary:        Hunt down social media accounts by username across social networks
+
+License:        MIT
+URL:            https://github.com/sherlock-project/sherlock
+Source:         %{url}/archive/%{source_ref}.tar.gz
+# Switch to new Source URL after adoption of tagged releases
+
+BuildArch:      noarch
+BuildRequires:  python3-devel
+
+%global _description %{expand:
+Hunt down social media accounts by username across 400+ social networks and
+websites. New targets are tested and implemented regularly.
+}
+
+%description %{_description}
+
+%prep
+%autosetup -n sherlock-%{source_ref}
+
+%generate_buildrequires
+%pyproject_buildrequires
+
+%build
+%pyproject_wheel
+
+%install
+%pyproject_install
+%pyproject_save_files -l sherlock sites result notify __init__ __main__
+
+sed -r -i '1{/^#!/d}' '%{buildroot}%{python3_sitelib}/*.py'
+
+%check
+# Tests fail when pwd isn't sherlock. Relative pathing need fix upstream.
+cd sherlock
+%{py3_test_envvars} %{python3} -m unittest tests.all --verbose
+cd ..
+
+%files -f %{pyproject_files}
+%doc README.md
+%{_bindir}/sherlock
+%{python3_sitelib}/resources
+%pycached %{python3_sitelib}/tests/*.py
+
+%changelog
+* Tue May 14 2024 Paul Pfeister <rh-bugzilla@pfeister.dev> 0.14.4
+- Initial package.