diff --git a/gnu/usr.sbin/postfix/Makefile b/gnu/usr.sbin/postfix/Makefile
index fef7c6dc1ea5..eb1b7a046e9c 100644
--- a/gnu/usr.sbin/postfix/Makefile
+++ b/gnu/usr.sbin/postfix/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2006/04/17 16:11:20 christos Exp $
+#	$NetBSD: Makefile,v 1.16 2006/04/17 19:18:59 christos Exp $
 
 # The first four/five of these are libraries and have to be built first.
 
@@ -12,7 +12,7 @@ SUBDIR=	util global dns masterlib .WAIT
 SUBDIR+=README_FILES anvil bounce cleanup discard error flush html \
 	lmtp local man master oqmgr pickup pipe postalias \
 	postcat postconf postdrop postfix postkick postlock \
-	postlog postmap postqueue postsuper proxymap qmgr qmqpd scache \
+	postlog postmap postqueue postsuper proxymap qmgr scache \
 	sendmail showq smtp smtpd spawn trivial-rewrite verify \
 	virtual proxymap
 
diff --git a/gnu/usr.sbin/postfix/html/Makefile b/gnu/usr.sbin/postfix/html/Makefile
index 8261dfd85be5..bd3eda59ba89 100644
--- a/gnu/usr.sbin/postfix/html/Makefile
+++ b/gnu/usr.sbin/postfix/html/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2006/04/17 16:16:42 christos Exp $
+#	$NetBSD: Makefile,v 1.14 2006/04/17 19:18:59 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -12,7 +12,7 @@ DIST=	${NETBSDSRCDIR}/gnu/dist/postfix/html
 PFX_DAEMONS= anvil.8.html bounce.8.html cleanup.8.html discard.8.html \
 	error.8.html flush.8.html lmtp.8.html local.8.html \
 	master.8.html oqmgr.8.html pickup.8.html pipe.8.html proxymap.8.html \
-	qmgr.8.html qmqpd.8.html scache.8.html showq.8.html smtp.8.html \
+	qmgr.8.html scache.8.html showq.8.html smtp.8.html \
 	smtpd.8.html spawn.8.html tlsmgr.8.html trivial-rewrite.8.html \
 	verify.8.html virtual.8.html
 PFX_COMMANDS= postalias.1.html postcat.1.html \
diff --git a/gnu/usr.sbin/postfix/man/man8/Makefile b/gnu/usr.sbin/postfix/man/man8/Makefile
index fcd154b39a9c..67b437455ef9 100644
--- a/gnu/usr.sbin/postfix/man/man8/Makefile
+++ b/gnu/usr.sbin/postfix/man/man8/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2006/04/17 16:11:20 christos Exp $
+#	$NetBSD: Makefile,v 1.12 2006/04/17 19:18:59 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -6,7 +6,7 @@ DIST=	${NETBSDSRCDIR}/gnu/dist/postfix/man/man8
 .PATH:	${DIST}
 
 MAN=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 local.8 \
-	lmtp.8 master.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 \
+	lmtp.8 master.8 pickup.8 pipe.8 qmgr.8 \
 	scache.8 showq.8 smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 \
 	oqmgr.8 spawn.8 flush.8 virtual.8 \
 	verify.8 proxymap.8
diff --git a/gnu/usr.sbin/postfix/qmqpd/Makefile b/gnu/usr.sbin/postfix/qmqpd/Makefile
deleted file mode 100644
index 6196f4897064..000000000000
--- a/gnu/usr.sbin/postfix/qmqpd/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2006/04/17 16:11:20 christos Exp $
-
-NOMAN=	# defined
-
-.include <bsd.own.mk>
-
-PROG=	qmqpd
-
-DIST=	${NETBSDSRCDIR}/gnu/dist/postfix/src/${PROG}
-.PATH:	${DIST}
-
-BINDIR=	${PFIX_LIBEXECDIR}
-
-SRCS=	qmqpd.c qmqpd_state.c qmqpd_peer.c
-
-DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
-LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
-
-.include <bsd.prog.mk>