diff -uar a/PKGBUILD b/PKGBUILD
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,13 +10,13 @@
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
 pkgver=4.20.1
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url="https://www.samba.org"
 license=('GPL-3.0-or-later')
 makedepends=('python' 'python-markdown' 'python-dnspython' 'docbook-xsl' 'pkg-config' 'libbsd' 'popt' 'libcups'
              'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb' 'krb5' 'pam'
-             'systemd' 'gnutls' 'talloc' 'tdb' 'dbus' 
+             'gnutls' 'talloc' 'tdb' 'dbus' 
              'perl-parse-yapp' 'libnsl' 'libtirpc' 'rpcsvc-proto' 'jansson'
              'liburing' 'perl-json' 'glusterfs')
 optdepends=(
@@ -27,7 +27,8 @@
 source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar{.gz,.asc}
         samba.logrotate
         samba.pam
-        samba.conf)
+        samba.conf
+        samba.sysconfig)
 validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution Verification Key <samba-bugs@samba.org>
 sha512sums=('bea2bacae5b3272045399057ddf88d8f38203dde04c718b0088fd45792cccd68047b413e66bca7418b19db8580879358b86531a8d6f2d76fbcd902c331050a84'
             'SKIP'
@@ -61,8 +62,7 @@
               --with-ldap \
               --with-winbind \
               --with-acl-support \
-              --with-systemd \
-              --systemd-install-services \
+              --without-systemd \
               --with-pam \
               --with-pammodulesdir=/usr/lib/security \
               --bundled-libraries=!tdb,!talloc,!pytalloc-util,!tevent,!popt,!ldb,!pyldb-util \
@@ -179,10 +179,8 @@
                "${pkgdir}"/usr/${script}
     done
 
-  # packaging/wscript_build to use /etc/conf.d
-  sed -i -e '/^EnvironmentFile/ s/sysconfig/conf.d/' "${pkgdir}"/usr/lib/systemd/system/*.service
   install -d -m755  "${pkgdir}"/etc/conf.d
-  install -m644 "${srcdir}"/samba-${pkgver}/packaging/systemd/samba.sysconfig "${pkgdir}"/etc/conf.d/samba
+  install -m644 "${srcdir}"/samba.sysconfig "${pkgdir}"/etc/conf.d/samba
 
   # create ephemeral dirs via tmpfiles rather than shipping them in package
   install -D -m644 "${srcdir}"/samba.conf "${pkgdir}"/usr/lib/tmpfiles.d/samba.conf