diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 5638faab6b3e..81ddf33346f8 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -1,44 +1,45 @@
 # New ports collection makefile for:    arpwatch
 # Date created:         March 24 1997
 # Whom:                 Brian Somers <brian@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	arpwatch
 PORTVERSION=	2.1.a14
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/ \
 		http://www.goodking.ca/pub/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.([^\.]*)$/\1/}
 
 MAINTAINER=	thomas@goodking.ca
 COMMENT=	Monitor arp & rarp requests
 
 CONFLICTS=	arpwatch-devel-2.*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--quiet
 INSTALL_TARGET=	install install-man
 MAN8=		arpwatch.8 arpsnmp.8
 
 USE_RC_SUBR=	arpwatch.sh
 
 .ifdef ARPDIR
 MAKE_ARGS=	ARPDIR=${ARPDIR}
 .endif
 
 post-install:
 	if [ ! -d ${PREFIX}/arpwatch ]; then				\
 		${MKDIR} ${PREFIX}/arpwatch;				\
 		${CHMOD} 755 ${PREFIX}/arpwatch;			\
 		${CHOWN} root:operator ${PREFIX}/arpwatch;		\
 	fi
 	${TOUCH} ${PREFIX}/arpwatch/arp.dat
 	${CHMOD} 644 ${PREFIX}/arpwatch/arp.dat
 	for files in ethercodes.dat d.awk e.awk p.awk; do		\
 		${INSTALL_DATA} ${WRKSRC}/$$files ${PREFIX}/arpwatch;	\
 	done
 	${INSTALL_SCRIPT} ${WRKSRC}/arp2ethers ${PREFIX}/arpwatch
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/arpwatch/files/patch-ag b/net-mgmt/arpwatch/files/patch-ag
index bbd68993bc74..82241c0504a6 100644
--- a/net-mgmt/arpwatch/files/patch-ag
+++ b/net-mgmt/arpwatch/files/patch-ag
@@ -1,39 +1,47 @@
---- arpwatch.c.orig	Thu Feb 22 22:47:29 2001
-+++ arpwatch.c	Thu Feb 22 22:47:29 2001
+--- arpwatch.c.orig	Thu Jan 22 17:18:20 2004
++++ arpwatch.c	Thu Jul 20 12:30:08 2006
 @@ -107,6 +107,8 @@
  
  char *prog;
  
 +char *Watcher = NULL;
 +
  int can_checkpoint;
  int swapped;
  int nobogons;
 @@ -170,7 +172,7 @@
  	interface = NULL;
  	rfilename = NULL;
  	pd = NULL;
 -	while ((op = getopt(argc, argv, "df:i:n:Nr:")) != EOF)
 +	while ((op = getopt(argc, argv, "df:i:m:n:Nr:")) != EOF)
  		switch (op) {
  
  		case 'd':
 @@ -202,6 +204,10 @@
  			rfilename = optarg;
  			break;
  
 +		case 'm':
 +			Watcher = optarg;
 +			break;
 +
  		default:
  			usage();
  		}
-@@ -751,6 +757,6 @@
+@@ -321,7 +327,6 @@
+ 
+ 	(void)setsignal(SIGINT, die);
+ 	(void)setsignal(SIGTERM, die);
+-	(void)setsignal(SIGHUP, die);
+ 	if (rfilename == NULL) {
+ 		(void)setsignal(SIGQUIT, checkpoint);
+ 		(void)setsignal(SIGALRM, checkpoint);
+@@ -751,6 +756,6 @@
  
  	(void)fprintf(stderr, "Version %s\n", version);
  	(void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]"
 -	    " [-n net[/width]] [-r file]\n", prog);
 +	    " [-m email] [-n net[/width]] [-r file]\n", prog);
  	exit(1);
  }
diff --git a/net-mgmt/arpwatch/pkg-descr b/net-mgmt/arpwatch/pkg-descr
index ccb427bc402f..7362aec69427 100644
--- a/net-mgmt/arpwatch/pkg-descr
+++ b/net-mgmt/arpwatch/pkg-descr
@@ -1,5 +1,6 @@
-The package contains tools that monitors ethernet activity and
+This package contains tools that monitors ethernet activity and
 maintains a database of ethernet/ip address pairings. It also reports
 certain changes via email.
 
-Author: arpwatch@ee.lbl.gov WWW: http://ee.lbl.gov/
+Author: arpwatch@ee.lbl.gov
+WWW: http://ee.lbl.gov/