diff --git a/src/etc/Makefile b/src/etc/Makefile
index b67075c7..97368d74 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.98 1999/07/06 07:55:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.99 1999/08/02 19:50:08 jakob Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -19,7 +19,7 @@ BIN1=	aliases bootptab changelist ccd.conf csh.cshrc csh.login csh.logout \
 	myname ipnat.rules netstart networks newsyslog.conf passwd.conf \
 	phones printcap protocols rbootd.conf rc rc.conf rc.local \
 	rc.securelevel rc.shutdown remote rpc security services shells \
-	syslog.conf weekly etc.${MACHINE}/disktab dhclient.conf
+	syslog.conf weekly etc.${MACHINE}/disktab dhclient.conf mailer.conf
 
 # -rw-rw-r--
 BIN2=	motd
diff --git a/src/etc/mailer.conf b/src/etc/mailer.conf
new file mode 100644
index 00000000..425f47c3
--- /dev/null
+++ b/src/etc/mailer.conf
@@ -0,0 +1,10 @@
+#	$OpenBSD: mailer.conf,v 1.1 1999/08/02 19:50:08 jakob Exp $
+#
+# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
+#
+sendmail	/usr/libexec/sendmail/sendmail
+send-mail	/usr/libexec/sendmail/sendmail
+mailq		/usr/libexec/sendmail/sendmail
+newaliases	/usr/libexec/sendmail/sendmail
+hoststat	/usr/libexec/sendmail/sendmail
+purgestat	/usr/libexec/sendmail/sendmail
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 2d63460b..f3a12f67 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.77 1999/07/18 09:39:51 niklas Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.78 1999/08/02 19:50:09 jakob Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -249,6 +249,11 @@ lpr
 # ./usr/libexec/lpr
 ..
 
+# ./libexec/sendmail
+sendmail	type=dir uname=root gname=wheel mode=0755
+# ./libexec/sendmail
+..
+
 # ./usr/libexec/uucp
 uucp
 # ./usr/libexec/uucp