diff -urN bin86.orig/Makefile bin86/Makefile
--- bin86.orig/Makefile	Mon Feb 13 13:50:30 2006
+++ bin86/Makefile	Wed Mar 22 01:52:21 2006
@@ -6,35 +6,21 @@
 #
 
 PORTNAME=	bin86
-PORTVERSION=	0.16.16
+PORTVERSION=	0.16.17
 CATEGORIES=	devel
-MASTER_SITES=	http://www.cix.co.uk/~mayday/dev86/
+MASTER_SITES=	http://homepage.ntlworld.com/robert.debath/dev86/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	shaun@inerd.com
 COMMENT=	16-bit assembler and loader (conflicts with devel/bcc)
 
 BINS=		as/as86 ld/ld86 ld/objchop ld/catimage ld/objdump86
 CONFLICTS=	bcc-*
-DOCS=		ChangeLog README README-0.4
-DOCDIR=		share/doc/${PORTNAME}
+PORTDOCS=	ChangeLog README README-0.4
 MAN1=		as86.1 ld86.1
+
 ONLY_FOR_ARCHS=	i386
-PLIST=		${WRKDIR}/pkg-plist
 
-post-extract:
-	${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
-
-pre-install:
-	${RM} -f ${PLIST}
-.for i in ${BINS}
-	${ECHO_CMD} bin/`${BASENAME} ${i}` >> ${PLIST}
-.endfor
-.if !defined(NOPORTDOCS)
-.for i in ${DOCS}
-	${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST}
-.endfor
-	${ECHO_CMD} "@dirrm " ${DOCDIR} >> ${PLIST}
-.endif
+PLIST_FILES+=	${BINS:C/..\//bin\//g}
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/*1 ${PREFIX}/man/man1
@@ -42,10 +28,8 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${DOCDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR}
-.endfor
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -urN bin86.orig/distinfo bin86/distinfo
--- bin86.orig/distinfo	Wed Jan 18 23:30:51 2006
+++ bin86/distinfo	Wed Mar 22 01:25:43 2006
@@ -1,3 +1,3 @@
-MD5 (bin86-0.16.16.tar.gz) = 48c56be9792b26702805cb59471c99e5
-SHA256 (bin86-0.16.16.tar.gz) = bb0a005bef11e513121b97cf0811ba2f356bf8effa6b67a2825ea478e6515964
-SIZE (bin86-0.16.16.tar.gz) = 147617
+MD5 (bin86-0.16.17.tar.gz) = c9e8d72dd2e7457b52d0e3164fc199a1
+SHA256 (bin86-0.16.17.tar.gz) = 429ba36cb6220083ad7cf56d644b7265d401e631c93eb42f4b7ab9bb48c6829c
+SIZE (bin86-0.16.17.tar.gz) = 152400
diff -urN bin86.orig/pkg-descr bin86/pkg-descr
--- bin86.orig/pkg-descr	Wed Jan 18 23:30:51 2006
+++ bin86/pkg-descr	Wed Mar 22 01:52:51 2006
@@ -5,6 +5,6 @@
 
 This port/package conflicts with devel/bcc.
 
-WWW:  http://www.cix.co.uk/~mayday/
+WWW: http://homepage.ntlworld.com/robert.debath/
 
 Trevor Johnson