diff --git a/usr.sbin/sendmail/cf/cf/Makefile b/usr.sbin/sendmail/cf/cf/Makefile
index 63e84404c178..f4be0a398798 100644
--- a/usr.sbin/sendmail/cf/cf/Makefile
+++ b/usr.sbin/sendmail/cf/cf/Makefile
@@ -1,7 +1,6 @@
 #	@(#)Makefile	8.5 (Berkeley) 12/1/93
 
 M4=	m4
-#M4=	/usr/src/usr.bin/m4/obj/m4
 CHMOD=	chmod
 ROMODE=	444
 RM=	rm -f
@@ -15,8 +14,8 @@ RM=	rm -f
 
 ALL=	ucbarpa.cf ucbvax.cf vangogh.cf \
 	chez.cf python.cf \
-	sun-lamp.cf pain.cf boat-anchor.cf netbsd-proto.cf trinity.cf \
-	clientproto.cf tcpproto.cf uucpproto.cf
+	boat-anchor.cf chimera.cf pain.cf sun-lamp.cf trinity.cf \
+	clientproto.cf netbsd-proto.cf tcpproto.cf uucpproto.cf
 
 all: $(ALL)
 
diff --git a/usr.sbin/sendmail/cf/cf/chimera.mc b/usr.sbin/sendmail/cf/cf/chimera.mc
new file mode 100644
index 000000000000..6cfef3908730
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/chimera.mc
@@ -0,0 +1,48 @@
+divert(-1)
+#
+# Copyright (c) 1993, 1994, 1995 Adam Glass
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988 The Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#
+include(`../m4/cf.m4')
+VERSIONID(`@(#)pain.mc	$Revision: 1.1 $')
+OSTYPE(bsd4.4)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+define(`MAIL_HUB', mail.netbsd.org)dnl
+define(`SMART_HOST', nobozo.cs.berkeley.edu)dnl
+define(`confCHECKPOINT_INTERVAL', 10)dnl
+define(`confAUTO_REBUILD', True)dnl
+define(`confMESSAGE_TIMEOUT', 3d/4h)dnl
+MASQUERADE_AS(netbsd.org)dnl
+LOCAL_USER(root)