diff --git a/python-fvs.changes b/python-fvs.changes
index 7a20fee..5ec6f99 100644
--- a/python-fvs.changes
+++ b/python-fvs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 26 09:52:57 UTC 2022 - Matej Cepl <mcepl@suse.com>
+
+- Clean up SPEC file.
+
 -------------------------------------------------------------------
 Sun Sep 25 11:33:18 UTC 2022 - Imo Hester <vortex@z-ray.de>
 
diff --git a/python-fvs.spec b/python-fvs.spec
index 1bc7cb2..88cbf24 100644
--- a/python-fvs.spec
+++ b/python-fvs.spec
@@ -15,10 +15,12 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 %define skip_python2 1
 # FVS requires Python 3.9 or higher
 %define skip_python37 1
 %define skip_python38 1
+%define modname FVS
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-fvs
 Version:        0.3.4
@@ -26,13 +28,12 @@ Release:        0
 Summary:        File Versioning System with hash comparison
 License:        MIT
 URL:            https://github.com/mirkobrombin/FVS
-Source0:        https://github.com/mirkobrombin/FVS/archive/%{version}/FVS-%{version}.tar.gz
+Source:         https://github.com/mirkobrombin/%{modname}/archive/refs/tags/%{version}.tar.gz#/%{modname}-%{version}.tar.gz
 BuildRequires:  %{python_module orjson}
-BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module wheel}
-BuildRequires:  python-rpm-macros
 BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 Requires:       python-orjson
 Requires(post): update-alternatives
 Requires(postun):update-alternatives
@@ -40,33 +41,34 @@ BuildArch:      noarch
 %python_subpackages
 
 %description
-File Versioning System with hash comparison and data storage to create unlinked states that can be deleted
+File Versioning System with hash comparison and data storage to
+create unlinked states that can be deleted
 
-Why FVS?
+The main reason for this project is for the purpose of personal
+knowledge and understanding of the versioning system. The second
+reason is to make a simple and easy-to-implement versioning
+system for Bottles.
 
-The main reason for this project is for the purpose of personal knowledge and understanding of the versioning system. The second reason is to make a simple and easy-to-implement versioning system for Bottles.
-
-There are plenty of other versioning systems out there, but all of these provide features that I wouldn't need in my projects.
-The purpose of FVS is to always remain as clear and simple as possible, providing only the functionality of organizing file versions into states,
-ie recovery points that take advantage of deduplication to minimize space consumption
+There are plenty of other versioning systems out there, but all
+of these provide features that I wouldn't need in my projects.
+The purpose of FVS is to always remain as clear and simple as
+possible, providing only the functionality of organizing file
+versions into states, ie recovery points that take advantage of
+deduplication to minimize space consumption
 
 %prep
-%setup -q -n FVS-%{version}
+%autosetup -p1 -n FVS-%{version}
 
 %build
-# Remove export CFLAGS=... for noarch packages (unneeded)
-# export CFLAGS="%{optflags}"
-# %python_build
 %pyproject_wheel
 
 %install
-# %python_install
 %pyproject_install
 %python_clone -a %{buildroot}%{_bindir}/fvs
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%python_expand $python setup.py test
+# No tests available, even upstream
 
 %post
 %python_install_alternative fvs
@@ -77,8 +79,8 @@ ie recovery points that take advantage of deduplication to minimize space consum
 %files %{python_files}
 %license LICENSE
 %doc README.md
-# For noarch packages: sitelib
-%{python_sitelib}/*
 %python_alternative %{_bindir}/fvs
+%{python_sitelib}/%{modname}-%{version}*-info
+%{python_sitelib}/fvs
 
 %changelog