diff --git a/sysutils/afio/Makefile b/sysutils/afio/Makefile
index 6e050feb18e0..c2ca3af564db 100644
--- a/sysutils/afio/Makefile
+++ b/sysutils/afio/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	afio
-PORTVERSION=	2.4.6
+PORTVERSION=	2.4.7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/backup
@@ -14,15 +14,13 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nox@jelal.hb.north.de
 
-WRKSRC=		${WRKDIR}/afio.2.4.6
-ALL_TARGET=	afio
+ALL_TARGET=	${PORTNAME}
 MAN1=		afio.1
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/afio
-	@(cd ${WRKSRC} ; \
-		${INSTALL_MAN} README SCRIPTS ${PREFIX}/share/doc/afio)
+	@${MKDIR} ${DOCSDIR}
+	@(cd ${WRKSRC} ; ${INSTALL_MAN} README SCRIPTS ${DOCSDIR})
 	@${MKDIR} ${PREFIX}/share/examples/afio
 	@${INSTALL_SCRIPT} ${FILESDIR}/afiodump.example ${PREFIX}/share/examples/afio
 	@${INSTALL_DATA} ${WRKSRC}/script1/DONTDUMP ${PREFIX}/share/examples/afio
diff --git a/sysutils/afio/distinfo b/sysutils/afio/distinfo
index fa842ca2fc75..0fa33c0d0baf 100644
--- a/sysutils/afio/distinfo
+++ b/sysutils/afio/distinfo
@@ -1 +1 @@
-MD5 (afio-2.4.6.tgz) = b6547725156edb525ef080128037d74c
+MD5 (afio-2.4.7.tgz) = 28fd6daa7805ee2263879ff1b9c96a9e
diff --git a/sysutils/afio/pkg-plist b/sysutils/afio/pkg-plist
index 7ae24f79437a..62460d2b835f 100644
--- a/sysutils/afio/pkg-plist
+++ b/sysutils/afio/pkg-plist
@@ -1,17 +1,17 @@
 bin/afio
-share/doc/afio/README
-share/doc/afio/SCRIPTS
-share/examples/afio/DONTDUMP
-share/examples/afio/README
-share/examples/afio/afiodump.example
-share/examples/afio/backup
-share/examples/afio/gnupg_read
-share/examples/afio/gnupg_write
-share/examples/afio/pgp_read
-share/examples/afio/pgp_write
-share/examples/afio/restore
-share/examples/afio/tapechange
-share/examples/afio/x.dot
-share/examples/afio/x.home
-@dirrm share/doc/afio
-@dirrm share/examples/afio
+%%PORTDOCS%%share/doc/afio/README
+%%PORTDOCS%%share/doc/afio/SCRIPTS
+%%PORTDOCS%%share/examples/afio/DONTDUMP
+%%PORTDOCS%%share/examples/afio/README
+%%PORTDOCS%%share/examples/afio/afiodump.example
+%%PORTDOCS%%share/examples/afio/backup
+%%PORTDOCS%%share/examples/afio/gnupg_read
+%%PORTDOCS%%share/examples/afio/gnupg_write
+%%PORTDOCS%%share/examples/afio/pgp_read
+%%PORTDOCS%%share/examples/afio/pgp_write
+%%PORTDOCS%%share/examples/afio/restore
+%%PORTDOCS%%share/examples/afio/tapechange
+%%PORTDOCS%%share/examples/afio/x.dot
+%%PORTDOCS%%share/examples/afio/x.home
+%%PORTDOCS%%@dirrm share/doc/afio
+%%PORTDOCS%%@dirrm share/examples/afio