diff --git a/whowatch-gcc15-fixes.patch b/whowatch-gcc15-fixes.patch
new file mode 100644
index 0000000..8ec2e76
--- /dev/null
+++ b/whowatch-gcc15-fixes.patch
@@ -0,0 +1,35 @@
+diff -ur a/src/proctree.h b/src/proctree.h
+--- a/src/proctree.h	2018-04-11 07:10:50.000000000 +0100
++++ b/src/proctree.h	2025-01-25 18:55:39.018468480 +0000
+@@ -19,7 +19,6 @@
+ };
+ 
+ int update_tree(void del(void*));
+-int update_tree();
+ struct proc_t* find_by_pid(int pid);
+ struct proc_t* tree_start(int root, int start);
+ struct proc_t* tree_next();
+diff -ur a/src/whowatch.c b/src/whowatch.c
+--- a/src/whowatch.c	2018-04-11 07:10:50.000000000 +0100
++++ b/src/whowatch.c	2025-01-25 19:05:36.133313903 +0000
+@@ -222,7 +222,7 @@
+ 	size_changed = 0;
+ }
+ 
+-static void winch_handler()
++static void winch_handler(int i)
+ {
+ 	size_changed++;
+ }
+diff -ur a/src/whowatch.h b/src/whowatch.h
+--- a/src/whowatch.h	2018-04-11 07:10:50.000000000 +0100
++++ b/src/whowatch.h	2025-01-25 19:00:56.018861138 +0000
+@@ -164,7 +164,7 @@
+ void curses_end();
+ 
+ /* proctree.c */
+-int update_tree();
++int update_tree(void del(void*));
+ 
+ /* plist.c */
+ void delete_tree_line(void *line);
diff --git a/whowatch.spec b/whowatch.spec
index 8cee597..66f7024 100644
--- a/whowatch.spec
+++ b/whowatch.spec
@@ -1,13 +1,16 @@
 Summary: Display information about users currently logged on 
 Name: whowatch
 Version: 1.8.6
-Release: 17%{?dist}
+Release: 23%{?dist}
 License: GPL-2.0-only
 URL: http://wizard.ae.krakow.pl/~mike/
 
 Source0: https://github.com/mtsuszycki/whowatch/archive/whowatch-%{version}.tar.gz
 Patch0: whowatch-configure-c99.patch
 
+# Submitted upstream: https://github.com/mtsuszycki/whowatch/pull/13
+Patch1: whowatch-gcc15-fixes.patch
+
 BuildRequires: make
 BuildRequires: gcc
 BuildRequires: ncurses-devel
@@ -42,6 +45,24 @@ touch aclocal.m4 Makefile.in src/config.h.in
 %{_bindir}/whowatch
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Jan 25 2025 Richard Fearn <richardfearn@gmail.com> - 1.8.6-20
+- Fix FTBFS (bug #2341538)
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild