diff --git a/1480.patch b/1480.patch
new file mode 100644
index 0000000..cd357c2
--- /dev/null
+++ b/1480.patch
@@ -0,0 +1,18 @@
+--- app.go	2023-08-07 21:07:21.939069312 -0400
++++ app_patched.go	2023-08-07 21:06:32.726425788 -0400
+@@ -760,7 +760,6 @@
+ 				// Stop listening (and unlink the socket if unix type):
+ 				socketListener.Close()
+ 
+-				<-h.cancelStateUpdateChan
+ 				close(h.stateUpdateChan)
+ 				close(h.cancelStateUpdateChan)
+ 
+@@ -775,6 +774,7 @@
+ 
+ 				// And we're done:
+ 				cancel()
++				return
+ 			}
+ 		}
+ 	}
diff --git a/headscale.spec b/headscale.spec
index 2e267f5..e551e6c 100644
--- a/headscale.spec
+++ b/headscale.spec
@@ -22,7 +22,7 @@ An open source, self-hosted implementation of the Tailscale control server.}
 %global golicenses      LICENSE
 
 Name:           headscale
-Release:        2
+Release:        3
 Summary:        An open source, self-hosted implementation of the Tailscale control server
 
 License:        BSD-3-Clause
@@ -40,6 +40,9 @@ Source4:        config.yaml
 
 # https://github.com/juanfont/headscale/pull/1287
 #Patch:          1287.patch
+# https://github.com/juanfont/headscale/pull/1480
+# https://github.com/jonathanspw/headscale-rpm/issues/2
+Patch:          1480.patch
 
 BuildRequires:  git-core
 BuildRequires:  systemd-rpm-macros
@@ -118,7 +121,11 @@ install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/headscale/config.yam
 
 
 %changelog
-* Fri Jun 07 2023 Dusty Mabe <dusty@dustymabe.com> - 0.22.3-2
+* Mon Aug 07 2023 Cody Robertson <cody@almalinux.org> - 0.22.3-3
+- Add Fix hangs on SIGTERM patch (#1480)
+- Fix incorrect day in changelog
+
+* Wed Jun 07 2023 Dusty Mabe <dusty@dustymabe.com> - 0.22.3-2
 - Add Requires on systemd
 
 * Fri May 12 2023 Jonathan Wright <jonathan@almalinux.org> - 0.22.3-1