diff --git a/openbox-calc-layer.patch b/openbox-calc-layer.patch
new file mode 100644
index 0000000..9f00bbb
--- /dev/null
+++ b/openbox-calc-layer.patch
@@ -0,0 +1,36 @@
+From https://bugzilla.icculus.org/show_bug.cgi?id=6669#c2
+
+diff --git a/openbox/client.c b/openbox/client.c
+index 3ff278ae..ac4ff827 100644
+--- a/openbox/client.c
++++ b/openbox/client.c
+@@ -2702,9 +2702,10 @@ static void client_calc_layer_internal(ObClient *self)
+ void client_calc_layer(ObClient *self)
+ {
+     GList *it;
++    GList *list = g_list_copy(stacking_list);
+ 
+     /* skip over stuff above fullscreen layer */
+-    for (it = stacking_list; it; it = g_list_next(it))
++    for (it = list; it; it = g_list_next(it))
+         if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break;
+ 
+     /* find the windows in the fullscreen layer, and mark them not-visited */
+@@ -2717,7 +2718,7 @@ void client_calc_layer(ObClient *self)
+     client_calc_layer_internal(self);
+ 
+     /* skip over stuff above fullscreen layer */
+-    for (it = stacking_list; it; it = g_list_next(it))
++    for (it = list; it; it = g_list_next(it))
+         if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break;
+ 
+     /* now recalc any windows in the fullscreen layer which have not
+@@ -2728,6 +2729,8 @@ void client_calc_layer(ObClient *self)
+                  !WINDOW_AS_CLIENT(it->data)->visited)
+             client_calc_layer_internal(it->data);
+     }
++
++    g_list_free(it);
+ }
+ 
+ gboolean client_should_show(ObClient *self)
diff --git a/openbox.spec b/openbox.spec
index 71fc467..9e1d7f4 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,9 +1,9 @@
 Name:		openbox
 Version:	3.6.1
-Release:	20%{?dist}
+Release:	31%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
-License:	GPLv2+
+License:	GPL-2.0-or-later
 URL:		http://openbox.org
 Source0:	http://openbox.org/dist/%{name}/%{name}-%{version}.tar.xz
 Source1:	http://icculus.org/openbox/tools/setlayout.c
@@ -12,6 +12,7 @@ Source3:	menu.xml
 Source4:	terminals.menu
 Patch1:		openbox-python3.patch
 Patch2:		openbox-kf5menu.patch
+Patch3:		openbox-calc-layer.patch
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -89,8 +90,9 @@ KDE session.
 
 %prep
 %setup -q
-%patch1 -p1 -b .python3
-%patch2 -p1 -b .kf5menu
+%patch -P1 -p1 -b .python3
+%patch -P2 -p1 -b .kf5menu
+%patch -P3 -p1 -b .calc-layer
 
 
 %build
@@ -171,6 +173,39 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Leigh Scott <leigh123linux@gmail.com> - 3.6.1-23
+- Rebuild fo new imlib2
+
+* Thu Apr 27 2023 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-22
+- fix crash with new glib (#2178299)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild