diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 84ba50e..5967e42 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -6,14 +6,14 @@
 %define vte_version 0.64.0
 %define desktop_file_utils_version 0.2.90
 
-Name: gnome-terminal
+Name:    gnome-terminal
 Version: 3.40.3
 Release: 1%{?dist}
 Summary: Terminal emulator for GNOME
 
 License: GPLv3+ and GFDL and LGPLv2+
-URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/gnome-terminal/3.40/gnome-terminal-%{version}.tar.xz
+URL:     https://wiki.gnome.org/Apps/Terminal
+Source0: https://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz
 Source1: org.gnome.Terminal.gschema.override
 
 Patch100: gnome-terminal-cntr-ntfy-autottl-ts.patch
@@ -61,12 +61,10 @@ This package provides a Nautilus extension that adds the 'Open in Terminal'
 option to the right-click context menu in Nautilus.
 
 %prep
-%setup -q
-%patch100 -p1 -b .cntr-ntfy-autottl-ts
-%patch101 -p1 -b .warnings
+%autosetup -p1
 
 %build
-autoreconf -f -i
+autoreconf --force --install
 %configure \
     --disable-silent-rules \
     --disable-static \
@@ -79,14 +77,14 @@ autoreconf -f -i
 %install
 %make_install
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
+rm -f %{buildroot}%{_libdir}/nautilus/extensions-3.0/*.la
 
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
+install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas
 
 %find_lang %{gettext_package} --with-gnome
 
 %check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Terminal.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.desktop
 make check
 
 %files -f %{gettext_package}.lang
@@ -117,6 +115,7 @@ make check
 %changelog
 * Tue Aug 24 2021 David King <amigadave@amigadave.com> - 3.40.3-1
 - Update to 3.40.3
+- Minor packaging improvements
 
 * Wed Aug 04 2021 Kalev Lember <klember@redhat.com> - 3.40.2-3
 - BuildRequire systemd-rpm-macros rather than systemd