diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile
index 0addf7cd8ca0..90148d1aa017 100644
--- a/sysutils/pftop/Makefile
+++ b/sysutils/pftop/Makefile
@@ -1,59 +1,60 @@
 # New ports collection makefile for:	pfflowd
 # Date created:		23 June 2003
 # Whom:			Max Laier <max@love2party.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	pftop
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.eee.metu.edu.tr/~canacar/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mlaier@freebsd.org
 COMMENT=	Utility for real-time display of statistics for pf
 
 MAN8=		pftop.8
 
 MANCOMPRESSED=	no
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 502106
 IGNORE=		only for 5.3 and above
 .endif
 
 .if ${OSVERSION} < 502116
 MAKE_ARGS=	LOCALBASE="${PREFIX}" OSLEVEL=34
 .if defined(WITH_ALTQ) && (${WITH_ALTQ} == "yes")
 CFLAGS+=	-DHAVE_ALTQ=1
 .endif
 .elif ${OSVERSION} < 600025
 MAKE_ARGS=	LOCALBASE="${PREFIX}" OSLEVEL=35
 CFLAGS+=	-DHAVE_ALTQ=1 -DHAVE_RULE_ANCHOR=1
 .elif ${OSVERSION} < 700049
 MAKE_ARGS=	LOCALBASE="${PREFIX}" OSLEVEL=37
 CFLAGS+=	-DHAVE_ALTQ=1
 .else
 MAKE_ARGS=	LOCALBASE="${PREFIX}" OSLEVEL=41
 CFLAGS+=	-DHAVE_ALTQ=1
 .endif
 
 MAKE_ENV+=	CC="${CC}" CFLAGS="${CFLAGS}" __MAKE_CONF=/dev/null
 
 PLIST_FILES=	sbin/pftop
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<sys/queue.h>|"${FILESDIR}/queue.h"|g' \
 	    ${WRKSRC}/engine.c
 	@${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.h
 	@${REINPLACE_CMD} -e 's|__dead|__dead2|g' ${WRKSRC}/sf-gencode.c
 	@${REINPLACE_CMD} -e 's|#include <net/if_pflog.h>||g' \
 	    ${WRKSRC}/sf-gencode.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pftop ${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/pftop.8 ${PREFIX}/man/man8
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/pftop/files/patch-pftop.c b/sysutils/pftop/files/patch-pftop.c
index 34f8fc455a79..537c1daa3d06 100644
--- a/sysutils/pftop/files/patch-pftop.c
+++ b/sysutils/pftop/files/patch-pftop.c
@@ -1,28 +1,43 @@
---- pftop.c.orig	2007-11-07 07:36:46.000000000 +0100
-+++ pftop.c	2008-04-01 17:03:25.847268996 +0200
-@@ -1570,10 +1570,10 @@
+--- pftop.c.orig	2007-11-07 01:36:46.000000000 -0500
++++ pftop.c	2008-05-16 15:57:12.000000000 -0400
+@@ -1486,7 +1486,13 @@
+ 	print_fld_size(FLD_BYTES, pr->bytes);
+ #endif
+ 	print_fld_uint(FLD_RULE, pr->nr);
+-	print_fld_str(FLD_DIR, pr->direction == PF_OUT ? "Out" : "In");
++	if (pr->direction == PF_IN)
++		print_fld_str(FLD_DIR, "In");
++	else if (pr->direction == PF_OUT)
++		print_fld_str(FLD_DIR, "Out");
++	else
++		print_fld_str(FLD_DIR, "Any");
++
+ 	if (pr->quick)
+ 		print_fld_str(FLD_QUICK, "Quick");
+ 
+@@ -1570,10 +1576,10 @@
  #ifdef HAVE_RULE_UGID
  	if (pr->uid.op)
  		tb_print_ugid(pr->uid.op, pr->uid.uid[0], pr->uid.uid[1],
 -		        "user", UID_MAX);
 +		        "user", UINT_MAX);
  	if (pr->gid.op)
  		tb_print_ugid(pr->gid.op, pr->gid.gid[0], pr->gid.gid[1],
 -		        "group", GID_MAX);
 +		        "group", UINT_MAX);
  #endif
  
  	if (pr->flags || pr->flagset) {
-@@ -1765,7 +1765,12 @@
+@@ -1765,7 +1771,12 @@
  				  strerror(errno));
  			return (-1);
  		}
 +#ifdef PFALTQ_FLAG_IF_REMOVED
 +		if (pa.altq.qid > 0 &&
 +		    !(pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED)) {
 +#else
  		if (pa.altq.qid > 0) {
 +#endif
  			pq.nr = nr;
  			pq.ticket = pa.ticket;
  			pq.buf = &qstats;