diff --git a/gnu/usr.sbin/yppasswdd/Makefile b/gnu/usr.sbin/yppasswdd/Makefile
index 115c217256fa..0688429ee6dd 100644
--- a/gnu/usr.sbin/yppasswdd/Makefile
+++ b/gnu/usr.sbin/yppasswdd/Makefile
@@ -1,3 +1,4 @@
+# $Id$
 # @(#)Makefile	8.3 (Berkeley) 4/2/94
 
 PROG=	yppasswdd
@@ -12,5 +13,11 @@ CFLAGS+=-DVERSION=\"0.5\" -DYPLIBDIR=\"/usr/libexec\" -D_GNU_SOURCE
 
 BINOWN=	bin
 BINMODE=555
+BINDIR= /usr/sbin
+
+afterinstall: /usr/libexec/yppwupdate
+
+/usr/libexec/yppwupdate: yppwupdate
+	install -c -o bin -g bin -m 555 yppwupdate /usr/libexec/yppwupdate
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.sbin/yppasswdd/yppwupdate b/gnu/usr.sbin/yppasswdd/yppwupdate
new file mode 100644
index 000000000000..77412b0e44d8
--- /dev/null
+++ b/gnu/usr.sbin/yppasswdd/yppwupdate
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# This script is invoked by yppasswdd to update the password
+# maps after the master password file has been modified.
+
+cd /var/yp; make