diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 4f59c72e5692..16a3c9f8cfbb 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xsidplay
-PORTVERSION=	1.6.3
+PORTVERSION=	1.6.4.3
 PORTEPOCH=	1
 CATEGORIES=	audio emulators
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
@@ -23,6 +23,8 @@ CONFIGURE_ARGS=	--with-qt-binaries=${X11BASE}/bin
 QTCPPFLAGS+=	${PTHREAD_CFLAGS}
 QTCFGLIBS+=	${PTHREAD_LIBS}
 
+MAN1=		xsidplay.1
+
 .include <bsd.port.pre.mk>
 
 .if ${MACHINE_ARCH} == "alpha"
@@ -34,8 +36,15 @@ pre-patch:
 	@${PERL} -pi -e 's|moc|${MOC:T}|g ; \
 		 s|qt-mt|${QTNAME}-mt|g' ${WRKSRC}/${file}
 .endfor
+	@${PERL} -pi -e 's|/usr/share|${PREFIX}|g' ${WRKSRC}/xsidplay.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xsidplay.1 ${MANPREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.faq ${DOCSDIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/xsidplay/distinfo b/audio/xsidplay/distinfo
index 4df79ac95950..e7fe02a2cb5b 100644
--- a/audio/xsidplay/distinfo
+++ b/audio/xsidplay/distinfo
@@ -1 +1 @@
-MD5 (xsidplay-1.6.3.tgz) = 2712556f53848749644f1f0466685885
+MD5 (xsidplay-1.6.4.3.tgz) = a57dda653c9c27068fb830de3de2e6f8
diff --git a/audio/xsidplay/pkg-plist b/audio/xsidplay/pkg-plist
index cbe5cebe841b..123caa539f94 100644
--- a/audio/xsidplay/pkg-plist
+++ b/audio/xsidplay/pkg-plist
@@ -1 +1,5 @@
 bin/xsidplay
+%%PORTDOCS%%share/doc/xsidplay/README
+%%PORTDOCS%%share/doc/xsidplay/STIL.faq
+%%PORTDOCS%%share/doc/xsidplay/hv_sids.faq
+%%PORTDOCS%%@dirrm share/doc/xsidplay