diff --git a/specs/pgbouncer/SOURCES/pgbouncer.service b/specs/pgbouncer/SOURCES/pgbouncer.service
index af35092ea..d8ac1ad09 100644
--- a/specs/pgbouncer/SOURCES/pgbouncer.service
+++ b/specs/pgbouncer/SOURCES/pgbouncer.service
@@ -1,21 +1,23 @@
 [Unit]
 Description=A lightweight connection pooler for PostgreSQL
 Documentation=man:pgbouncer(1)
+Documentation=https://www.pgbouncer.org
 After=network-online.target
 Wants=network-online.target
 
 [Service]
-RemainAfterExit=yes
 Type=notify
-TimeoutSec=300
-
 User=pgbouncer
 Group=pgbouncer
-
 Environment=BOUNCERCONF=/etc/pgbouncer/pgbouncer.ini
- 
-ExecStart=/usr/bin/pgbouncer -q ${BOUNCERCONF}
-ExecReload=/usr/bin/pgbouncer -R -q ${BOUNCERCONF}
+EnvironmentFile=-/etc/sysconfig/pgbouncer
+ExecStart=/usr/bin/pgbouncer ${BOUNCERCONF}
+ExecReload=/bin/kill -HUP $MAINPID
+KillSignal=SIGINT
+Restart=on-failure
+
+# Give a reasonable amount of time for the server to start up/shut down
+TimeoutSec=300
 
 [Install]
 WantedBy=multi-user.target
diff --git a/specs/pgbouncer/pgbouncer.spec b/specs/pgbouncer/pgbouncer.spec
index 13d688b07..a6d784433 100644
--- a/specs/pgbouncer/pgbouncer.spec
+++ b/specs/pgbouncer/pgbouncer.spec
@@ -12,12 +12,12 @@
 Summary:           Lightweight connection pooler for PostgreSQL
 Name:              pgbouncer
 Version:           1.23.1
-Release:           0%{?dist}
+Release:           1%{?dist}
 License:           MIT and BSD
 Group:             Applications/Databases
-URL:               https://pgbouncer.github.io
+URL:               https://www.pgbouncer.org
 
-Source0:           https://pgbouncer.github.io/downloads/files/%{version}/%{name}-%{version}.tar.gz
+Source0:           https://www.pgbouncer.org/downloads/files/%{version}/%{name}-%{version}.tar.gz
 Source1:           %{name}.service
 Source2:           %{name}.logrotate
 Source3:           %{name}.pam
@@ -145,6 +145,9 @@ fi
 ################################################################################
 
 %changelog
+* Thu Oct 31 2024 Anton Novojilov <andy@essentialkaos.com> - 1.23.1-1
+- Improve systemd unit file
+
 * Mon Sep 09 2024 Anton Novojilov <andy@essentialkaos.com> - 1.23.1-0
 - https://www.pgbouncer.org/changelog.html#pgbouncer-123x