diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
index 9c3d686833af..5ca30dc0937f 100644
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	scponly
 PORTVERSION=	4.8.20110526
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	shells security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-snapshots
 DISTNAME=	${PORTNAME}-20110526
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Tiny shell that only permits scp and sftp
 WWW=		https://github.com/scponly/scponly/wiki
 
 LICENSE=	BSD2CLAUSE
 
 USES=		cpe tar:tgz
 
 PORTDOCS=	BUILDING-JAILS.TXT INSTALL README SECURITY
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	CHROOT DEFAULT_CHDIR DOCS GFTP RSYNC SCP SUBVERSION SVNSERVE \
 		UNISON WILDCARDS WINSCP
 OPTIONS_DEFAULT=	WILDCARDS
 DEFAULT_CHDIR_DESC=	Chdir(2) by default
 WILDCARDS_DESC=		Wildcards processing
 GFTP_DESC=	gftp support
 RSYNC_DESC=	rsync support
 CHROOT_DESC=	chroot(8) functionality
 SCP_DESC=	vanilla scp support
 SVNSERVE_DESC=	Subversion support for svn+ssh://
 UNISON_DESC=	Unisson support
 WINSCP_DESC=	WinSCP support
 
 OPTIONS_SUB=	yes
 
 .if !exists(/usr/bin/sftp)
 BUILD_DEPENDS+=	openssh-portable>0:security/openssh-portable
 RUN_DEPENDS+=	openssh-portable>0:security/openssh-portable
 .endif
 DEFAULT_CHDIR_CONFIGURE_ON=	--with-default-chdir=${SCPONLY_DEFAULT_CHDIR}
 WILDCARDS_CONFIGURE_ENABLE=	wildcards
 GFTP_CONFIGURE_ENABLE=		gftp-compat
 CHROOT_CONFIGURE_ENABLE=	chrooted-binary
 CHROOT_USE=			RC_SUBR=scponlyc
 RSYNC_BUILD_DEPENDS=		rsync:net/rsync
 RSYNC_RUN_DEPENDS=		rsync:net/rsync
 RSYNC_CONFIGURE_ENABLE=		rsync-compat
 SCP_CONFIGURE_ENABLE=		scp-compat
 SUBVERSION_CONFIGURE_ENABLE=	svn-compat
 SUBVERSION_BUILD_DEPENDS=	svn:devel/subversion
 SUBVERSION_RUN_DEPENDS=		svn:devel/subversion
 SVNSERVE_BUILD_DEPENDS=		svn:devel/subversion
 SVNSERVE_RUN_DEPENDS=		svn:devel/subversion
 SVNSERVE_CONFIGURE_ENABLE=	svnserv-compat
 UNISON_BUILD_DEPENDS=		unison:net/unison
 UNISON_RUN_DEPENDS=		unison:net/unison
 UNISON_CONFIGURE_ENABLE=	unison-compat
 WINSCP_CONFIGURE_ENABLE=	winscp-compat
 
 post-patch:
 	@${ECHO_MSG} "In addition to knobs available from the OPTIONS dialog,"
 	@${ECHO_MSG} "you may set SCPONLY_DEFAULT_CHDIR to make users 'cd' to"
 	@${ECHO_MSG} "this directory after authentication."
 	@${REINPLACE_CMD} -e "s/-o 0 -g 0//g" ${WRKSRC}/Makefile.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/setup_chroot.sh ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/config.h ${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/shells/scponly/pkg-plist b/shells/scponly/pkg-plist
index 2e8c74dbbfc4..b7b6b05c355d 100644
--- a/shells/scponly/pkg-plist
+++ b/shells/scponly/pkg-plist
@@ -1,15 +1,15 @@
 @shell bin/scponly
 %%CHROOT%%@exec echo ""
 %%CHROOT%%@exec echo "To setup chroot cage, run the following commands:"
 %%CHROOT%%@exec echo "  1) cd %%PREFIX%%/%%EXAMPLESDIR%%/ && /bin/sh setup_chroot.sh"
 %%CHROOT%%@exec echo "  2) Set scponlyc_enable=\"YES\" in /etc/rc.conf"
 %%CHROOT%%@exec echo "  3) Run %%PREFIX%%/etc/rc.d/scponly start"
 %%PORTDOCS%%@exec echo ""
 %%PORTDOCS%%@exec echo "For information on several potential security concerns,"
 %%PORTDOCS%%@exec echo "please read:"
 %%PORTDOCS%%@exec echo "%%PREFIX%%/%%DOCSDIR%%/SECURITY"
 %%CHROOT%%@shell sbin/scponlyc
 %%CHROOT%%%%EXAMPLESDIR%%/setup_chroot.sh
 %%CHROOT%%%%EXAMPLESDIR%%/config.h
 etc/scponly/debuglevel
-man/man8/scponly.8.gz
+share/man/man8/scponly.8.gz