diff --git a/srcpkgs/systemd-units/files/acpid.service b/srcpkgs/systemd-units/files/acpid.service
index 937e8fd3ddc..8e2bb7fe3c9 100644
--- a/srcpkgs/systemd-units/files/acpid.service
+++ b/srcpkgs/systemd-units/files/acpid.service
@@ -1,17 +1,7 @@
 [Unit]
 Description=ACPI Event Daemon
-After=syslog.target
-
-# This could probably benefit from socket activation, but honestly I think it
-# is time for acpid to go away, and hence I am not planning to spend the time
-# to add socket activation here. We use Type=forking to ensure that the
-# communication sockets are in place before boot proceeds with any service
-# needing this service. Would acpid support socket activation we could use
-# Type=simple here.
+Requires=acpid.socket
 
 [Service]
-Type=forking
-ExecStart=/usr/sbin/acpid
-
-[Install]
-WantedBy=multi-user.target
+EnvironmentFile=/etc/conf.d/acpid
+ExecStart=/usr/sbin/acpid -f ${ACPID_ARGS}
diff --git a/srcpkgs/systemd-units/files/acpid.socket b/srcpkgs/systemd-units/files/acpid.socket
new file mode 100644
index 00000000000..1e5365bf1ec
--- /dev/null
+++ b/srcpkgs/systemd-units/files/acpid.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=ACPID Listen Socket
+
+[Socket]
+ListenStream=/run/acpid.socket
+
+[Install]
+WantedBy=sockets.target
diff --git a/srcpkgs/systemd-units/files/nscd.service b/srcpkgs/systemd-units/files/nscd.service
new file mode 100644
index 00000000000..22b9dd8e7a5
--- /dev/null
+++ b/srcpkgs/systemd-units/files/nscd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Name Service Cache Daemon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/nscd
+ExecStop=/usr/sbin/nscd --shutdown
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Also=nscd.socket
diff --git a/srcpkgs/systemd-units/files/nscd.socket b/srcpkgs/systemd-units/files/nscd.socket
new file mode 100644
index 00000000000..9b8da6f39a6
--- /dev/null
+++ b/srcpkgs/systemd-units/files/nscd.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=Name Service Cache Daemon Socket
+
+[Socket]
+ListenStream=/var/run/nscd/socket
+
+[Install]
+WantedBy=sockets.target
diff --git a/srcpkgs/systemd-units/files/saslauthd.service b/srcpkgs/systemd-units/files/saslauthd.service
new file mode 100644
index 00000000000..42d8ad768b0
--- /dev/null
+++ b/srcpkgs/systemd-units/files/saslauthd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Cyrus SASL authentication daemon
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/saslauthd
+ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS
+PidFile=/var/run/saslauthd/saslauthd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/srcpkgs/systemd-units/files/ufw.service b/srcpkgs/systemd-units/files/ufw.service
new file mode 100644
index 00000000000..dd9cd5ec372
--- /dev/null
+++ b/srcpkgs/systemd-units/files/ufw.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=CLI Netfilter Manager
+
+[Service]
+Type=oneshot
+ExecStart=/lib/ufw/ufw-init start
+ExecStop=/lib/ufw/ufw-init stop
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/srcpkgs/systemd-units/files/wicd.service b/srcpkgs/systemd-units/files/wicd.service
new file mode 100644
index 00000000000..4ae9e4317b6
--- /dev/null
+++ b/srcpkgs/systemd-units/files/wicd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Wicd Network Manager
+
+[Service]
+Type=dbus
+BusName=org.wicd.daemon
+ExecStart=/usr/sbin/wicd -f
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/srcpkgs/systemd-units/template b/srcpkgs/systemd-units/template
index 9ca272091ce..74ba7380fd5 100644
--- a/srcpkgs/systemd-units/template
+++ b/srcpkgs/systemd-units/template
@@ -1,6 +1,6 @@
 # Template file for 'systemd-units'
 pkgname=systemd-units
-version=0.4
+version=0.5
 build_style=custom-install
 short_desc="Void GNU/Linux systemd units"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -15,4 +15,5 @@ do_install()
 {
 	vmkdir lib/systemd/system
 	install -m644 ${FILESDIR}/*.service ${DESTDIR}/lib/systemd/system
+	install -m644 ${FILESDIR}/*.socket ${DESTDIR}/lib/systemd/system
 }