diff --git a/.gitignore b/.gitignore
index f5a4186..a2a45d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ nicotine+-1.2.15.tar.bz2
 /nicotine+-3.0.4.tar.gz
 /nicotine+-3.0.6.tar.gz
 /nicotine+-3.1.0.tar.gz
+/nicotine+-3.1.1.tar.gz
diff --git a/nicotine+.spec b/nicotine+.spec
index b13dce4..504d2d3 100644
--- a/nicotine+.spec
+++ b/nicotine+.spec
@@ -2,7 +2,7 @@
 %global appdata_id org.nicotine_plus.Nicotine
 
 Name:           nicotine+
-Version:        3.1.0
+Version:        3.1.1
 Release:        1%{?dist}
 Summary:        A graphical client for Soulseek
 
@@ -21,14 +21,14 @@ BuildRequires:  libappstream-glib
 BuildRequires:  python3-devel
 # Needed for tests
 BuildRequires:  gtk3
-BuildRequires:  %{py3_dist pygobject}
 BuildRequires:  %{py3_dist pytest}
 BuildRequires:  xorg-x11-server-Xvfb
+# Runtime dependencies are not declared in setup.py (except pygobject) but are
+# actually required (see doc/DEPENDENCIES.md)
 Requires:       gdbm
 Requires:       gspell
 Requires:       gtk3
 Requires:       libappindicator-gtk3
-Requires:       %{py3_dist pygobject}
 BuildArch:      noarch
 
 %description
@@ -41,30 +41,30 @@ that users want and/or need.
 %prep
 %autosetup -n nicotine-plus-%{version}
 
-# Remove bundled egg-info
-rm -rf *.egg-info
+%generate_buildrequires
+%pyproject_buildrequires -r
 
 
 %build
-%py3_build
+%pyproject_wheel
 
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files pynicotine
+
+%find_lang %{altname}
 
 # Remove installed documentation/license files. Useful ones are installed using
 # %%doc/%%license
 rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{altname}/
-rm $RPM_BUILD_ROOT%{python3_sitelib}/pynicotine/*/README.md
-
-%find_lang %{altname}
 
 
 %check
 # Some tests require an X server
 display=":70"
 Xvfb $display -screen 0 1024x768x24 -ac -noreset & xpid=$!
-trap "kill -TERM $xpid ||:" EXIT
+trap "kill -TERM $xpid || :" EXIT
 sleep 3
 export DISPLAY=$display
 # Tests requiring an Internet connection are disabled
@@ -74,19 +74,20 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{appdata_id}.desk
 appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{appdata_id}.metainfo.xml
 
 
-%files -f %{altname}.lang
+%files -f %{pyproject_files} -f %{altname}.lang
 %doc AUTHORS.md NEWS.md README.md TRANSLATORS.md
 %license COPYING
 %{_bindir}/%{altname}
-%{python3_sitelib}/pynicotine/
-%{python3_sitelib}/nicotine_plus-*.egg-info
 %{_datadir}/applications/%{appdata_id}.desktop
-%{_datadir}/icons/hicolor/*/apps/*.*
+%{_datadir}/icons/hicolor/*/apps/%{appdata_id}*.*
 %{_metainfodir}/%{appdata_id}.metainfo.xml
 %{_mandir}/man1/%{altname}.1.*
 
 
 %changelog
+* Mon Aug 02 2021 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.1.1-1
+- Update to 3.1.1
+
 * Sun Jul 25 2021 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.1.0-1
 - Update to 3.1.0
 
diff --git a/sources b/sources
index b6ee55a..7f69c25 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nicotine+-3.1.0.tar.gz) = 355bb6dfc7fcd9d8c6b04ab2f4f563fb7d80781cb7d7c437d577799e404fe6aef66942d138f889849740ade80ffd9c8927db182821d0b746e185d8bea4f004aa
+SHA512 (nicotine+-3.1.1.tar.gz) = 28eaca5f270176ff5562f693906b4dfef180b91f0113332e3fc1659acaa6bb49e8f956b03612effab14f6833e9e7c00ebca75ca3c49906cd990d1e82e1bb5be3