diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
@@ -311,11 +311,6 @@ kadm5			gname=bin uname=root mode=0755
 # ./usr/include/kerberosV
 ..

-# ./usr/include/libmilter
-libmilter		gname=bin uname=root mode=0755
-# ./usr/include/libmilter
-..
-
 # ./usr/include/openssl
 openssl		gname=bin uname=root mode=0755
 # ./usr/include/openssl
@@ -395,11 +390,6 @@ lpr
 # ./usr/libexec/lpr
 ..

-# ./libexec/sendmail
-sendmail	type=dir uname=root gname=wheel mode=0755
-# ./libexec/sendmail
-..
-
 # ./libexec/smtpd
 smtpd		type=dir uname=root gname=wheel mode=0755
 # ./libexec/smtpd
@@ -620,12 +610,6 @@ curses
 # ./usr/share/doc/html/curses
 ..

-# ./usr/share/doc/html/milter
-milter
-
-# ./usr/share/doc/html/milter
-..
-
 # ./usr/share/doc/html
 ..

@@ -1145,57 +1129,6 @@ nls
 # ./usr/share/nls
 ..

-# ./usr/share/sendmail
-sendmail
-
-# ./usr/share/sendmail/cf
-cf
-# ./usr/share/sendmail/cf
-..
-
-# ./usr/share/sendmail/domain
-domain
-# ./usr/share/sendmail/domain
-..
-
-# ./usr/share/sendmail/feature
-feature
-# ./usr/share/sendmail/feature
-..
-
-# ./usr/share/sendmail/hack
-hack
-# ./usr/share/sendmail/hack
-..
-
-# ./usr/share/sendmail/m4
-m4
-# ./usr/share/sendmail/m4
-..
-
-# ./usr/share/sendmail/mailer
-mailer
-# ./usr/share/sendmail/mailer
-..
-
-# ./usr/share/sendmail/ostype
-ostype
-# ./usr/share/sendmail/ostype
-..
-
-# ./usr/share/sendmail/sh
-sh
-# ./usr/share/sendmail/sh
-..
-
-# ./usr/share/sendmail/siteconfig
-siteconfig
-# ./usr/share/sendmail/siteconfig
-..
-
-# ./usr/share/sendmail
-..
-
 # ./usr/share/snmp
 snmp

diff --git a/etc/mtree/special b/etc/mtree/special
@@ -58,7 +58,6 @@ aliases		type=file mode=0644 uname=root gname=wheel optional
 aliases.db	type=file mode=0644 uname=root gname=wheel optional
 secrets		type=file mode=0640 uname=root gname=_smtpd optional
 secrets.db	type=file mode=0640 uname=root gname=_smtpd optional
-sendmail.cf	type=file mode=0644 uname=root gname=wheel optional
 smtpd.conf	type=file mode=0644 uname=root gname=wheel
 spamd.conf	type=file mode=0644 uname=root gname=wheel optional
 submit.cf	type=file mode=0644 uname=root gname=wheel optional
diff --git a/etc/rc b/etc/rc
@@ -503,7 +503,7 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then
 	fi
 fi

-start_daemon hostapd rwhod lpd sendmail smtpd httpd ftpd ftpproxy tftpd
+start_daemon hostapd rwhod lpd smtpd httpd ftpd ftpproxy tftpd
 start_daemon identd inetd rarpd bootparamd rbootd mopd popa3d
 start_daemon spamd spamlogd kdc kadmind kpasswdd sndiod
 echo '.'
diff --git a/etc/rc.conf b/etc/rc.conf
@@ -43,7 +43,7 @@ hostapd_flags=NO	# for normal use: ""
 ifstated_flags=NO	# for normal use: ""
 relayd_flags=NO		# for normal use: ""
 snmpd_flags=NO		# for normal use: ""
-smtpd_flags=NO		# for normal use: ""
+smtpd_flags=		# for normal use: ""
 sndiod_flags=NO		# for normal use: ""
 ldapd_flags=NO		# for normal use: ""
 inetd_flags=NO		# for normal use: ""
@@ -60,8 +60,6 @@ tftpd_flags=NO		# for normal use: "[chroot dir]"
 # use -u to disable chroot, see httpd(8)
 httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))

-# For normal use: "-L sm-mta -bd -q30m", and note there is a cron job
-sendmail_flags="-L sm-mta -C/etc/mail/localhost.cf -bd -q30m"
 spamd_flags=NO		# for normal use: "" and see spamd(8)
 spamd_black=NO		# set to YES to run spamd without greylisting
 spamlogd_flags=""	# use eg. "-i interface" and see spamlogd(8)
diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail
diff --git a/gnu/README b/gnu/README
diff --git a/gnu/usr.sbin/Makefile b/gnu/usr.sbin/Makefile
@@ -1,5 +1,5 @@
 #	$OpenBSD: Makefile,v 1.7 2002/06/01 00:14:21 deraadt Exp $

-SUBDIR+=	mkhybrid sendmail
+SUBDIR+=	mkhybrid

 .include <bsd.subdir.mk>
diff --git a/gnu/usr.sbin/sendmail/CACerts b/gnu/usr.sbin/sendmail/CACerts
diff --git a/gnu/usr.sbin/sendmail/FAQ b/gnu/usr.sbin/sendmail/FAQ
diff --git a/gnu/usr.sbin/sendmail/KNOWNBUGS b/gnu/usr.sbin/sendmail/KNOWNBUGS
diff --git a/gnu/usr.sbin/sendmail/LICENSE b/gnu/usr.sbin/sendmail/LICENSE
diff --git a/gnu/usr.sbin/sendmail/Makefile b/gnu/usr.sbin/sendmail/Makefile
diff --git a/gnu/usr.sbin/sendmail/Makefile.inc b/gnu/usr.sbin/sendmail/Makefile.inc
diff --git a/gnu/usr.sbin/sendmail/README b/gnu/usr.sbin/sendmail/README
diff --git a/gnu/usr.sbin/sendmail/RELEASE_NOTES b/gnu/usr.sbin/sendmail/RELEASE_NOTES
diff --git a/gnu/usr.sbin/sendmail/cf/Makefile b/gnu/usr.sbin/sendmail/cf/Makefile
diff --git a/gnu/usr.sbin/sendmail/cf/README b/gnu/usr.sbin/sendmail/cf/README
diff --git a/gnu/usr.sbin/sendmail/cf/cf/Makefile b/gnu/usr.sbin/sendmail/cf/cf/Makefile
diff --git a/gnu/usr.sbin/sendmail/cf/cf/README b/gnu/usr.sbin/sendmail/cf/cf/README
diff --git a/gnu/usr.sbin/sendmail/cf/cf/chez.cs.mc b/gnu/usr.sbin/sendmail/cf/cf/chez.cs.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/clientproto.mc b/gnu/usr.sbin/sendmail/cf/cf/clientproto.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/corpse.mc b/gnu/usr.sbin/sendmail/cf/cf/corpse.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/courtesan-nonet.mc b/gnu/usr.sbin/sendmail/cf/cf/courtesan-nonet.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/courtesan.mc b/gnu/usr.sbin/sendmail/cf/cf/courtesan.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/cs-hpux10.mc b/gnu/usr.sbin/sendmail/cf/cf/cs-hpux10.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/cs-hpux9.mc b/gnu/usr.sbin/sendmail/cf/cf/cs-hpux9.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/cs-osf1.mc b/gnu/usr.sbin/sendmail/cf/cf/cs-osf1.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/cs-solaris2.mc b/gnu/usr.sbin/sendmail/cf/cf/cs-solaris2.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/cs-sunos4.1.mc b/gnu/usr.sbin/sendmail/cf/cf/cs-sunos4.1.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/cs-ultrix4.mc b/gnu/usr.sbin/sendmail/cf/cf/cs-ultrix4.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/cyrusproto.mc b/gnu/usr.sbin/sendmail/cf/cf/cyrusproto.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/generic-bsd4.4.mc b/gnu/usr.sbin/sendmail/cf/cf/generic-bsd4.4.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/generic-hpux10.mc b/gnu/usr.sbin/sendmail/cf/cf/generic-hpux10.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/generic-hpux9.mc b/gnu/usr.sbin/sendmail/cf/cf/generic-hpux9.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/generic-linux.mc b/gnu/usr.sbin/sendmail/cf/cf/generic-linux.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/generic-mpeix.mc b/gnu/usr.sbin/sendmail/cf/cf/generic-mpeix.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/generic-nextstep3.3.mc b/gnu/usr.sbin/sendmail/cf/cf/generic-nextstep3.3.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/generic-osf1.mc b/gnu/usr.sbin/sendmail/cf/cf/generic-osf1.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/generic-solaris.mc b/gnu/usr.sbin/sendmail/cf/cf/generic-solaris.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/generic-sunos4.1.mc b/gnu/usr.sbin/sendmail/cf/cf/generic-sunos4.1.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/generic-ultrix4.mc b/gnu/usr.sbin/sendmail/cf/cf/generic-ultrix4.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/huginn.cs.mc b/gnu/usr.sbin/sendmail/cf/cf/huginn.cs.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/knecht.mc b/gnu/usr.sbin/sendmail/cf/cf/knecht.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/lucifier.mc b/gnu/usr.sbin/sendmail/cf/cf/lucifier.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/mail.cs.mc b/gnu/usr.sbin/sendmail/cf/cf/mail.cs.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/mail.eecs.mc b/gnu/usr.sbin/sendmail/cf/cf/mail.eecs.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/mailspool.cs.mc b/gnu/usr.sbin/sendmail/cf/cf/mailspool.cs.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-bulk.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-bulk.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-localhost.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-localhost.mc
diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-proto.mc