diff --git a/install.sh b/install.sh
index 2fc86f8..8e9a2a4 100755
--- a/install.sh
+++ b/install.sh
@@ -94,6 +94,8 @@ install_data misc_systemd_units/startup-tags.service     "$DESTDIR$systemdunitdi
 install_data misc_systemd_units/startup-hostname.service "$DESTDIR$systemdunitdir/startup-hostname.service"
 install_data misc_systemd_units/unbound.service          "$DESTDIR$systemdunitdir/unbound.service"
 install_data misc_systemd_units/xaruba.service           "$DESTDIR$systemdunitdir/xaruba.service"
+install_data misc_systemd_units/yppasswd.service         "$DESTDIR$systemdunitdir/yppasswd.service"
+install_data misc_systemd_units/ypserv.service           "$DESTDIR$systemdunitdir/ypserv.service"
 install_exec mkmotd/mkmotd.pl                            "$DESTDIR$usr_sbindir/mkmotd.pl"
 install_data mkmotd/motd.service                         "$DESTDIR$systemdunitdir/motd.service"
 install_exec mxgrub/mxgrub                               "$DESTDIR$usr_sbindir/mxgrub"
diff --git a/misc_systemd_units/yppasswd.service b/misc_systemd_units/yppasswd.service
new file mode 100644
index 0000000..8ac29c1
--- /dev/null
+++ b/misc_systemd_units/yppasswd.service
@@ -0,0 +1,14 @@
+[Unit]
+After=network.service gateway.service mxmount.service automount.service
+
+Wants=startup-hostname.service
+After=startup-hostname.service
+ConditionPathExists=/node/startup-hostname/wtf
+
+[Service]
+Type=forking
+ExecStart=/package/nis/sbin/rpc.yppasswdd -D /package/nis/src -e chsh
+
+[Install]
+WantedBy=network.target
+
diff --git a/misc_systemd_units/ypserv.service b/misc_systemd_units/ypserv.service
new file mode 100644
index 0000000..72668cd
--- /dev/null
+++ b/misc_systemd_units/ypserv.service
@@ -0,0 +1,18 @@
+[Unit]
+After=network.service gateway.service mxmount.service automount.service
+Before=network.target
+
+Wants=startup-hostname.service
+After=startup-hostname.service
+ConditionPathExists=/node/startup-hostname/wtf
+
+[Service]
+Type=forking
+Restart=always
+ExecStartPre=-/sbin/ip addr add 141.14.31.96/20 dev net03
+ExecStart=/package/nis/sbin/ypserv
+ExecStopPost=-/sbin/ip addr del 141.14.31.96/20 dev net03
+
+[Install]
+WantedBy=network.target
+