diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 55a4cf509503..7ce8d98d5606 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -146,7 +146,8 @@ SUBDIR+=lpr
 .endif
 
 .if !defined(NO_SENDMAIL)
-SUBDIR+=mailstats \
+SUBDIR+=editmap \
+	mailstats \
 	makemap \
 	praliases \
 	sendmail
diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile
new file mode 100644
index 000000000000..4e75403c1ecb
--- /dev/null
+++ b/usr.sbin/editmap/Makefile
@@ -0,0 +1,51 @@
+# $FreeBSD$
+
+MAINTAINER=	gshapiro@FreeBSD.org
+
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+.PATH: ${SENDMAIL_DIR}/editmap
+
+PROG=	editmap
+SRCS=	editmap.c
+MAN=	editmap.8
+
+CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
+CFLAGS+= -DNEWDB -DNOT_SENDMAIL
+
+.if exists(${.OBJDIR}/../../lib/libsm)
+LIBSMDIR:=	${.OBJDIR}/../../lib/libsm
+.else
+LIBSMDIR!=	cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR
+.endif
+LIBSM:=		${LIBSMDIR}/libsm.a
+
+.if exists(${.OBJDIR}/../../lib/libsmdb)
+LIBSMDBDIR:=	${.OBJDIR}/../../lib/libsmdb
+.else
+LIBSMDBDIR!=	cd ${.CURDIR}/../../lib/libsmdb; make -V .OBJDIR
+.endif
+LIBSMDB:=	${LIBSMDBDIR}/libsmdb.a
+
+.if exists(${.OBJDIR}/../../lib/libsmutil)
+LIBSMUTILDIR:=	${.OBJDIR}/../../lib/libsmutil
+.else
+LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
+.endif
+LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
+
+DPADD=	${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
+LDADD=	${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
+
+SRCS+=	sm_os.h
+CLEANFILES+=sm_os.h
+
+# User customizations to the sendmail build environment
+CFLAGS+=${SENDMAIL_CFLAGS}
+DPADD+=${SENDMAIL_DPADD}
+LDADD+=${SENDMAIL_LDADD}
+LDFLAGS+=${SENDMAIL_LDFLAGS}
+
+sm_os.h:
+	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+
+.include <bsd.prog.mk>