diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 7d0c55095e58..edf43baa90f7 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	nullmailer
 PORTVERSION=	2.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/nullmailer/ \
 		http://untroubled.org/nullmailer/archive/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MTA for hosts which relay to a fixed set of smart relays
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
 USE_CXXSTD=	gnu++98
 USE_RC_SUBR=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${LOCALSTATEDIR}
 
 SUB_FILES=	pkg-install pkg-deinstall pkg-message
 SUB_LIST=	LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS}
 
 USERS=		nullmail
 GROUPS=		nullmail
 
 PLIST_SUB=	LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS}
 
 OPTIONS_DEFINE=	GNUTLS
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_USES=		localbase:ldflags
 GNUTLS_CONFIGURE_ENABLE=tls
 GNUTLS_LDFLAGS=		-lgnutls
 
 LOCALSTATEDIR=	/var
 
 post-install:
 	${INSTALL_DATA} -c ${FILESDIR}/remotes.sample ${STAGEDIR}${ETCDIR}
 	${ECHO} 'hostname' > ${STAGEDIR}${ETCDIR}/me.sample
 
 .include <bsd.port.mk>
diff --git a/mail/nullmailer/files/pkg-deinstall.in b/mail/nullmailer/files/pkg-deinstall.in
deleted file mode 100644
index 1f2d7da63f59..000000000000
--- a/mail/nullmailer/files/pkg-deinstall.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-        answer=$(ask "${question}" "${dflt}")
-        case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xDEINSTALL ]; then
-    if [ ! -n "$BATCH" ]; then
-	if /bin/ps -axc | /usr/bin/grep -q nullmailer-send; then
-	    if yesno "There are some nullmailer processes running.  Shall I kill them" y; then
-		%%PREFIX%%/etc/rc.d/nullmailer stop
-		sleep 2
-	    else
-		echo "OK ... I hope you know what you are doing."
-	    fi
-	fi
-
-    fi
-fi