diff --git a/mail/milter-sender/Makefile b/mail/milter-sender/Makefile
index 5a4b9844f7b2..e9cc4a79615a 100644
--- a/mail/milter-sender/Makefile
+++ b/mail/milter-sender/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	milter-sender
-PORTVERSION=	0.58
+PORTVERSION=	0.61
 CATEGORIES=	mail
 MASTER_SITES=	http://www.snert.com/Software/download/
-DISTFILES=	libsnert-1.36.tgz milter-sender-${PORTVERSION}.tgz
+DISTFILES=	libsnert-1.39.tgz milter-sender-${PORTVERSION}.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Real-time sender address verification, based on Milter API
@@ -39,7 +39,7 @@ CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 
 DOCS=		CHANGES.TXT index.shtml style.css mailto.js \
-		license-body.html LICENSE.TXT
+		LICENSE.TXT
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=--with-db --localstatedir=/var/spool \
 		--enable-milter-cf="${PREFIX}/etc/milter-sender.cf"
 
 post-patch:
-.if ( ${OSVERSION} < 440000 )
+.if ( ${OSVERSION} < 440000 ) # please contact vs@ if in doubt
 	${REINPLACE_CMD} 's/xargs -J{}/gxargs -i{}/' ${WRKSRC}/../lib/configure
 	${REINPLACE_CMD} 's+/usr/sbin/daemon -f ++' ${WRKSRC}/milter-sender.sh.in
 .endif
diff --git a/mail/milter-sender/distinfo b/mail/milter-sender/distinfo
index 0ec6a9a97af0..80c3b3e2b0a6 100644
--- a/mail/milter-sender/distinfo
+++ b/mail/milter-sender/distinfo
@@ -1,4 +1,4 @@
-MD5 (libsnert-1.36.tgz) = c4b130c5d20682b6cd8579d2040a12a9
-SIZE (libsnert-1.36.tgz) = 236249
-MD5 (milter-sender-0.58.tgz) = b12ec6f6969ebeeede5e1c463082c069
-SIZE (milter-sender-0.58.tgz) = 236430
+MD5 (libsnert-1.39.tgz) = 3017eaaa62c1c9f321f4d323dbb01c7e
+SIZE (libsnert-1.39.tgz) = 299689
+MD5 (milter-sender-0.61.tgz) = da277e57d858a37aaa8ba850e34cd498
+SIZE (milter-sender-0.61.tgz) = 263998
diff --git a/mail/milter-sender/files/patch-ac b/mail/milter-sender/files/patch-ac
index f8b171bdd3e1..6786cae13bc0 100644
--- a/mail/milter-sender/files/patch-ac
+++ b/mail/milter-sender/files/patch-ac
@@ -1,15 +1,15 @@
---- milter-sender.sh.in.orig	Tue Feb 24 20:18:59 2004
-+++ milter-sender.sh.in	Sat Mar  6 12:33:09 2004
-@@ -69,34 +69,24 @@
- start()
- {
+--- milter-sender.sh.in.orig	Thu Aug 12 09:44:49 2004
++++ milter-sender.sh.in	Mon Aug 23 10:45:57 2004
+@@ -88,35 +88,25 @@
+ 	rm -f $STATE_DIR/mutex
+ 
  	NAME=`basename "$PROGRAM"`
 -        printf "Starting %s" $NAME
  
  	pid=`getpid "$PROGRAM"`
  	if [ X"$pid" != X ]; then
 -		printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n'
-+		echo " milter-sender:FAILED"
++ 		echo " milter-sender:FAILED"
  		return
  	fi
  
@@ -19,8 +19,7 @@
 -	# Start the program in the background from a sub-shell
 -	# so that process will appear in the ps output immediately.
 -	sh -c "$PROGRAM $OPTIONS &"
-+	cd $STATE_DIR && /usr/sbin/daemon -f $PROGRAM $OPTIONS &
- 
+-
 -	pid=`getpid "$PROGRAM"`
 -	if [ X"$pid" = X ]; then
 -		printf '\r\033[71C['${FG_RED}'FAILED'${FG_NORMAL}']\n'
@@ -28,9 +27,12 @@
 -	fi
 -
 -	printf '\r\033[71C['${FG_GREEN}'  OK  '${FG_NORMAL}']\n'
-+	echo -n " milter-sender"
++ 	cd $STATE_DIR && /usr/sbin/daemon -f $PROGRAM $OPTIONS &
++  
++ 	echo -n " milter-sender"
  }
  
+ unalias stop
  stop()
  {
  	NAME=`basename "$PROGRAM"`
@@ -38,7 +40,7 @@
  
  	pid=`getpid "$PROGRAM"`
  	if [ X"$pid" != X ]; then
-@@ -113,7 +103,7 @@
+@@ -133,7 +123,7 @@
  			
  			pid=`getpid "$PROGRAM"`
  			if [ X"$pid" != X ]; then					
@@ -47,7 +49,7 @@
  				return
  			fi
  			
-@@ -132,7 +122,7 @@
+@@ -152,7 +142,7 @@
  		fi
  	fi
  
@@ -56,7 +58,7 @@
  }
  
  case "$1" in
-@@ -163,9 +153,9 @@
+@@ -183,9 +173,9 @@
  status)
  	pid=`getpid "$PROGRAM"`
  	if [ X"$pid" != X ]; then
diff --git a/mail/milter-sender/pkg-plist b/mail/milter-sender/pkg-plist
index 606b779d4044..809d8c226159 100644
--- a/mail/milter-sender/pkg-plist
+++ b/mail/milter-sender/pkg-plist
@@ -19,7 +19,6 @@ sbin/milter-sender
 %%PORTDOCS%%%%DOCSDIR%%/Img/sun.gif
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT
 %%PORTDOCS%%%%DOCSDIR%%/index.shtml
-%%PORTDOCS%%%%DOCSDIR%%/license-body.html
 %%PORTDOCS%%%%DOCSDIR%%/mailto.js
 %%PORTDOCS%%%%DOCSDIR%%/style.css
 @unexec echo