diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 7497adb..fd1b6c7 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -22,7 +22,7 @@ provides=('mod_proxy_uwsgi')
 conflicts=('mod_proxy_uwsgi')
 replaces=('mod_proxy_uwsgi')
 depends=('zlib' 'apr-util' 'pcre2' 'libnghttp2' 'openssl' 'libxcrypt')
-makedepends=('libxml2' 'lua' 'curl' 'brotli' 'jansson')
+makedepends=('libxml2' 'lua' 'curl' 'brotli' 'jansson' 'db' 'systemd')
 optdepends=(
     'lua: for mod_lua module'
     'libxml2: for mod_proxy_html, mod_xml2enc modules'
@@ -32,6 +32,7 @@ optdepends=(
     'uwsgi: for mod_proxy_uwsgi module'
     'lynx: apachectl status'
     'perl: for apxs and dbmmanage'
+    'systemd-libs: for mod_systemd module'
 )
 source=(
     https://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
@@ -44,7 +45,7 @@ sha256sums=('eb397feeefccaf254f8d45de3768d9d68e8e73851c49afd5b7176d1ecf80c340'
             'SKIP'
             '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
             '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
-            'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
+            '5e75558e96fb96541ee787dd2d3703b66c86e4f6e0fa834de9789b23505e14dc'
             'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
 # following keys are coming from https://downloads.apache.org/httpd/KEYS
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8' # Jim Jagielski
@@ -87,7 +88,7 @@ build() {
       --enable-proxy-http --enable-proxy-ftp \
       --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \
       --enable-lua --enable-xml2enc --enable-http2 \
-      --enable-proxy-http2 --enable-md --enable-brotli \
+      --enable-proxy-http2 --enable-md --enable-brotli --enable-systemd \
       --with-apr=/usr/bin/apr-1-config \
       --with-apr-util=/usr/bin/apu-1-config \
       --with-pcre2
diff --git a/trunk/httpd.service b/trunk/httpd.service
index 67805ff..7064d95 100644
--- a/trunk/httpd.service
+++ b/trunk/httpd.service
@@ -3,13 +3,14 @@ Description=Apache Web Server
 After=network.target remote-fs.target nss-lookup.target
 
 [Service]
-Type=simple
+Type=notify
 ExecStart=/usr/bin/httpd -k start -DFOREGROUND
-ExecStop=/usr/bin/httpd -k graceful-stop
 ExecReload=/usr/bin/httpd -k graceful
+# Send SIGWINCH for graceful stop
+KillSignal=SIGWINCH
+KillMode=mixed
 PrivateTmp=true
 LimitNOFILE=infinity
-KillMode=mixed
 
 [Install]
 WantedBy=multi-user.target