diff --git a/base/chrony/chrony.SMBuild b/base/chrony/chrony.SMBuild
index 7717c15..76a0db6 100755
--- a/base/chrony/chrony.SMBuild
+++ b/base/chrony/chrony.SMBuild
@@ -34,7 +34,7 @@ build() {
 
   mkdir -p $pkg/var/lib/chrony
 
-  preprunitservice chrony down
+  preprunitservice -s chrony -d
 
   mkfinalpkg
 }
diff --git a/base/smartmontools/smartmontools.SMBuild b/base/smartmontools/smartmontools.SMBuild
index e454e03..ebe73e4 100755
--- a/base/smartmontools/smartmontools.SMBuild
+++ b/base/smartmontools/smartmontools.SMBuild
@@ -28,7 +28,7 @@ build() {
 
   mv $pkg/etc/smartd.conf $pkg/etc/smartd.conf.new
 
-  preprunitservice smartd down
+  preprunitservice -s smartd -d
 
   mkfinalpkg
 }
diff --git a/base/sysklogd/sysklogd.SMBuild b/base/sysklogd/sysklogd.SMBuild
index 8fca195..39f2957 100755
--- a/base/sysklogd/sysklogd.SMBuild
+++ b/base/sysklogd/sysklogd.SMBuild
@@ -44,8 +44,8 @@ build() {
     chmod 640 $pkg/var/log/$i.new
   done
 
-  preprunitservice syslogd finish
-  preprunitservice klogd finish
+  preprunitservice -s syslogd -f
+  preprunitservice -s klogd -f
   chmod 755 $pkg/etc/service/{klogd,syslogd/finish}
 
   mkfinalpkg
diff --git a/net/dnsmasq/dnsmasq.SMBuild b/net/dnsmasq/dnsmasq.SMBuild
index 0c7f76f..1e6bdd7 100755
--- a/net/dnsmasq/dnsmasq.SMBuild
+++ b/net/dnsmasq/dnsmasq.SMBuild
@@ -23,7 +23,7 @@ build() {
   install -Dm 600 dnsmasq.conf.example $pkg/etc/dnsmasq.conf.new
   cp COPYING* $pkgdocs/
 
-  preprunitservice dnsmasq down
+  preprunitservice -s dnsmasq -d
 
   mkfinalpkg
 }
diff --git a/net/dovecot/dovecot.SMBuild b/net/dovecot/dovecot.SMBuild
index 0ac9521..624bf4e 100755
--- a/net/dovecot/dovecot.SMBuild
+++ b/net/dovecot/dovecot.SMBuild
@@ -48,7 +48,7 @@ build() {
 
   install -Dm 644 $srcdir/dovecot.conf.sample $pkg/etc/dovecot/dovecot.conf.new
 
-  preprunitservice dovecot down
+  preprunitservice -s dovecot -d
 
   mkfinalpkg
 }
diff --git a/net/hostapd/hostapd.SMBuild b/net/hostapd/hostapd.SMBuild
index fae50e2..c79f23a 100755
--- a/net/hostapd/hostapd.SMBuild
+++ b/net/hostapd/hostapd.SMBuild
@@ -34,7 +34,7 @@ build() {
 
   cp ../COPYING $pkgdocs/
 
-  preprunitservice hostapd down
+  preprunitservice -s hostapd -d
 
   mkfinalpkg
 }
diff --git a/net/nginx/nginx.SMBuild b/net/nginx/nginx.SMBuild
index e2c54a5..d140ef1 100755
--- a/net/nginx/nginx.SMBuild
+++ b/net/nginx/nginx.SMBuild
@@ -48,7 +48,7 @@ build() {
 
   cp LICENSE $pkgdocs/
 
-  preprunitservice nginx down
+  preprunitservice -s nginx -d
 
   (
     cd $pkg/etc/nginx
diff --git a/net/openntpd/openntpd.SMBuild b/net/openntpd/openntpd.SMBuild
index a736e6d..0ffaf82 100755
--- a/net/openntpd/openntpd.SMBuild
+++ b/net/openntpd/openntpd.SMBuild
@@ -29,7 +29,7 @@ build() {
 
   cp COPYING $pkgdocs/
 
-  preprunitservice openntpd down
+  preprunitservice -s openntpd -d
 
   mkfinalpkg
 }
diff --git a/net/openssh/openssh.SMBuild b/net/openssh/openssh.SMBuild
index 81fb5e7..51f8e5b 100755
--- a/net/openssh/openssh.SMBuild
+++ b/net/openssh/openssh.SMBuild
@@ -50,7 +50,7 @@ build() {
   cp $srcdir/sshd_config $pkg/etc/ssh/sshd_config.new
   mv $pkg/etc/ssh/ssh_config $pkg/etc/ssh/ssh_config.new
 
-  preprunitservice openssh 
+  preprunitservice -s openssh 
 
   mkfinalpkg
 }
diff --git a/net/openvpn/openvpn.SMBuild b/net/openvpn/openvpn.SMBuild
index 6cd4d49..7aa29f0 100755
--- a/net/openvpn/openvpn.SMBuild
+++ b/net/openvpn/openvpn.SMBuild
@@ -28,7 +28,7 @@ build() {
 
   cp COPY* $pkgdocs/
 
-  preprunitservice openvpn down
+  preprunitservice -s openvpn -d
 
   mkfinalpkg
 }
diff --git a/net/postfix/postfix.SMBuild b/net/postfix/postfix.SMBuild
index ab3a139..360753e 100755
--- a/net/postfix/postfix.SMBuild
+++ b/net/postfix/postfix.SMBuild
@@ -1,6 +1,6 @@
 app=postfix
 version=3.4.9
-build=1sml
+build=2sml
 homepage="https://www.postfix.org/"
 download="https://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-$version.tar.gz"
 desc="Fast, secure and easy-to-administer mail server"
@@ -54,11 +54,11 @@ build() {
     cd bin 
     ln -s sendmail mailq
     ln -s sendmail newaliases
-    rm -r $pkg/usr
+    rm -rv $pkg/usr
   )
 
-  preprunitservice postfix down
-  preprunitservice postfix.ssl down
+  preprunitservice -s postfix -d
+  preprunitservice -s postfix.ssl -d
 
   mkfinalpkg
 }
diff --git a/net/privoxy/privoxy.SMBuild b/net/privoxy/privoxy.SMBuild
index f0cbedf..352a328 100755
--- a/net/privoxy/privoxy.SMBuild
+++ b/net/privoxy/privoxy.SMBuild
@@ -40,7 +40,7 @@ build() {
   make
   make install DESTDIR=$pkg
 
-  preprunitservice privoxy down
+  preprunitservice -s privoxy -d
 
   (
     cd $pkg/etc/privoxy
@@ -49,8 +49,6 @@ build() {
     done
   )
 
-  #mv $pkg/share/doc/LICENSE $pkgdocs/
-
   mkfinalpkg
 }
 
diff --git a/net/samba/samba.SMBuild b/net/samba/samba.SMBuild
index c407eb0..4c26332 100755
--- a/net/samba/samba.SMBuild
+++ b/net/samba/samba.SMBuild
@@ -69,14 +69,14 @@ build() {
 
   rmdir $pkg/bind-dns
 
-  preprunitservice smbd down
-  preprunitservice nmbd down
+  preprunitservice -s smbd -d
+  preprunitservice -s nmbd -d
 
   mkfinalpkg
 }
 
 sha512sums="
-bc0eb8bc62fd2c4aa94b452a79e0a31fb3ad52bd46535b5f4c5eff4de8781419c3eb066a8394e704e7d4097c9651932a8de76d5b37cc05547d9a3ed48bf157ae  samba-4.18.0.tar.gz
+969acb2ece0c34ff19eac31cdef1362ffc73c6f60abc477a5ab9cb089e13d942b222a7ad7bde8833a551d55d6b42d1cec7d7b19e6919a9a142881458e2611f27  samba-4.18.0.tar.lz
 bc2df70e327fea5dfbd923600225f1448815d842c37d6937dd74eab7f7699d7f52cd7a8e28a61233974649cf86661a0107dce5019d33b71205e4b41bac73f4e2  add_missing___compar_fn_t.patch
 58de5e79fdfd06e828d478e112d581d333a8bee88d2602b92204d780f0d707b27dd84f8e2e6b00fca40da81c8fe99aa5bcec70d8b393d3a0a83199c72a4aa48b  getpwent_r.patch
 9642e0de5a39ab940e0f53040ae20fccdbde471bed9bcca713482f26e7c88451e405bd63d719d0548975c7c4c045b51b0006672d34ec4390c3b5a618ea6c8d85  missing-headers.patch
@@ -85,4 +85,4 @@ b7906d66fe55a980a54161ee3f311b51bcbce76b8d4c8cc1ba6d0c5bdf98232cb192b9d2c1aa7b3e
 f997d0bca9de64a567bccc245bec41e4aa00bacb379d8e348678dcafcf7e723e8716608c5d2d266ad816439b8b93bb8ee28371308a01c9d9c50229f1fc8deb67  netgroup.patch
 c0bbe1186b150a9bb2a0b741a8cfbd7a5109e5fed1eaa07aaa38cf026ebe054d38cc01e2496f0cab7b40f743e1b7ecfbf8a4d5820810226c4152021df65f36dc  pidl.patch
 e98fd19f65d954f04f7e3b5be86e9c4bcc9ac090c40037de77bfeb266617747c514aeb42f3daf84113b2f3374480d25e368bc1fdebc1870458eda12329d2062e  samba-bgqd-include-signal-h.patch
-"
+"
\ No newline at end of file
diff --git a/net/tor/tor.SMBuild b/net/tor/tor.SMBuild
index 7628486..136c590 100755
--- a/net/tor/tor.SMBuild
+++ b/net/tor/tor.SMBuild
@@ -34,7 +34,7 @@ build() {
   mkdir -p $pkg/var/lib/tor
   chown -R tor:tor $pkg/var/lib/tor
 
-  preprunitservice tor down
+  preprunitservice -s tor -d
   
   mkfinalpkg
 }
diff --git a/net/unbound/unbound.SMBuild b/net/unbound/unbound.SMBuild
index c387c5f..2bd0264 100755
--- a/net/unbound/unbound.SMBuild
+++ b/net/unbound/unbound.SMBuild
@@ -30,11 +30,11 @@ build() {
 
   cp LICENSE $pkgdocs/
 
-  preprunitservice unbound down
+  preprunitservice -s unbound -d
 
   mkfinalpkg
 }
 
 sha512sums="
 a31fea727101180db11fe4ce84c35ca558ba3f45822e8c5b745741c9a9ce2d7bd75e3e2e752866d2ac006b80886098ee591d9f8ed576d0c8baab1c8889862132  unbound-1.17.1.tar.lz
-"
\ No newline at end of file
+"
diff --git a/net/vnstat/vnstat.SMBuild b/net/vnstat/vnstat.SMBuild
index e2a60b2..80cccf0 100755
--- a/net/vnstat/vnstat.SMBuild
+++ b/net/vnstat/vnstat.SMBuild
@@ -28,7 +28,7 @@ build() {
 
   ( cd $pkg/etc ; mv vnstat.conf vnstat.conf.new )
 
-  preprunitservice vnstat down
+  preprunitservice -s vnstat -d
 
   mkfinalpkg
 }
diff --git a/net/wpa-supplicant/wpa-supplicant.SMBuild b/net/wpa-supplicant/wpa-supplicant.SMBuild
index d4b5962..6780824 100755
--- a/net/wpa-supplicant/wpa-supplicant.SMBuild
+++ b/net/wpa-supplicant/wpa-supplicant.SMBuild
@@ -40,7 +40,7 @@ build() {
   install -m 0755 $srcdir/wpa_connect_action.sh $pkg/etc/wpa_connect_action.sh
   mkdir -p $pkg/var/run/wpa_supplicant
 
-  preprunitservice wpa-supplicant down
+  preprunitservice -s wpa-supplicant -d
 
   mkfinalpkg
 }