diff --git a/ports-mgmt/pkgfe/Makefile b/ports-mgmt/pkgfe/Makefile
index 579cf61b4645..97e63676f316 100644
--- a/ports-mgmt/pkgfe/Makefile
+++ b/ports-mgmt/pkgfe/Makefile
@@ -1,31 +1,37 @@
 # New ports collection makefile for:	pkgfe
 # Date created:		2006-01-14
 # Whom:			Sulev-Madis Silber <madis555@hot.ee>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	pkgfe
 PORTVERSION=	20060929
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://kodu.neti.ee/~madis555/pkgfe/releases/ \
 		http://ketas.life.ee/pkgfe/releases/ \
 		http://ketas.si.pri.ee/pkgfe/releases/ \
 
 MAINTAINER=	madis555@hot.ee
 COMMENT=	Ncurses front-end to manage the ports collection
 
 RUN_DEPENDS=	portupgrade:${PORTSDIR}/sysutils/portupgrade \
-		portaudit:${PORTSDIR}/security/portaudit \
-		portsnap:${PORTSDIR}/sysutils/portsnap
+		portaudit:${PORTSDIR}/security/portaudit
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 600033 && ( ${OSVERSION} < 504103 || ${OSVERSION} > 600000 )
+RUN_DEPENDS+=	portsnap:${PORTSDIR}/sysutils/portsnap
+.endif
 
 NO_BUILD=	yes
 
-PLIST_FILES=	sbin/pkgfe etc/pkgfe.conf
+PLIST_FILES=	sbin/pkgfe etc/pkgfe.conf.sample
 
 do-install:
 	${REINPLACE_CMD} -e 's|%PREFIX%|${PREFIX}|g' ${WRKSRC}/pkgfe
 	${INSTALL_SCRIPT} ${WRKSRC}/pkgfe ${PREFIX}/sbin/pkgfe
-	${INSTALL_DATA} ${WRKSRC}/pkgfe.conf ${PREFIX}/etc/pkgfe.conf
+	${INSTALL_DATA} ${WRKSRC}/pkgfe.conf ${PREFIX}/etc/pkgfe.conf.sample
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/pkgfe/Makefile b/sysutils/pkgfe/Makefile
index 579cf61b4645..97e63676f316 100644
--- a/sysutils/pkgfe/Makefile
+++ b/sysutils/pkgfe/Makefile
@@ -1,31 +1,37 @@
 # New ports collection makefile for:	pkgfe
 # Date created:		2006-01-14
 # Whom:			Sulev-Madis Silber <madis555@hot.ee>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	pkgfe
 PORTVERSION=	20060929
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://kodu.neti.ee/~madis555/pkgfe/releases/ \
 		http://ketas.life.ee/pkgfe/releases/ \
 		http://ketas.si.pri.ee/pkgfe/releases/ \
 
 MAINTAINER=	madis555@hot.ee
 COMMENT=	Ncurses front-end to manage the ports collection
 
 RUN_DEPENDS=	portupgrade:${PORTSDIR}/sysutils/portupgrade \
-		portaudit:${PORTSDIR}/security/portaudit \
-		portsnap:${PORTSDIR}/sysutils/portsnap
+		portaudit:${PORTSDIR}/security/portaudit
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 600033 && ( ${OSVERSION} < 504103 || ${OSVERSION} > 600000 )
+RUN_DEPENDS+=	portsnap:${PORTSDIR}/sysutils/portsnap
+.endif
 
 NO_BUILD=	yes
 
-PLIST_FILES=	sbin/pkgfe etc/pkgfe.conf
+PLIST_FILES=	sbin/pkgfe etc/pkgfe.conf.sample
 
 do-install:
 	${REINPLACE_CMD} -e 's|%PREFIX%|${PREFIX}|g' ${WRKSRC}/pkgfe
 	${INSTALL_SCRIPT} ${WRKSRC}/pkgfe ${PREFIX}/sbin/pkgfe
-	${INSTALL_DATA} ${WRKSRC}/pkgfe.conf ${PREFIX}/etc/pkgfe.conf
+	${INSTALL_DATA} ${WRKSRC}/pkgfe.conf ${PREFIX}/etc/pkgfe.conf.sample
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>