diff --git a/irc/tkirc/Makefile b/irc/tkirc/Makefile
index 35c7c6749574..d5325f589e34 100644
--- a/irc/tkirc/Makefile
+++ b/irc/tkirc/Makefile
@@ -7,28 +7,34 @@
 
 PORTNAME=	tkirc
 PORTVERSION=	2.46
-CATEGORIES=	irc tk83
+PORTREVISION=	1
+CATEGORIES=	irc tk84
 MASTER_SITES=	http://netsplit.de/tkirc2/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	carpetsmoker@xs4all.nl
 COMMENT=	A GUI for the ircII Internet Relay Chat client
 
-RUN_DEPENDS=	irc:${PORTSDIR}/irc/ircII \
-		wish8.3:${PORTSDIR}/x11-toolkits/tk83
+RUN_DEPENDS=	irc:${PORTSDIR}/irc/ircII
 
+USE_TK=		yes
 WRKSRC=		${WRKDIR}/tkirc2
 NO_BUILD=	yes
 
+post-patch:
+	@${REINPLACE_CMD} 's|wish8\.3|${WISH}|;' ${WRKSRC}/tkirc2
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tkirc2 ${PREFIX}/bin
 	${LN} -f ${PREFIX}/bin/tkirc2 ${PREFIX}/bin/tkirc
-	${MKDIR} ${PREFIX}/share/doc/tkirc
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/tkirc
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/tkirc
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tkirc
-	${MKDIR} ${PREFIX}/share/doc/tkirc/examples
-	${TAR} cf - -C ${WRKSRC} .tkirc2 | \
-	    ${TAR} xf - -C ${PREFIX}/share/doc/tkirc/examples
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${MKDIR} ${EXAMPLESDIR}
+	${MV} ${WRKSRC}/.tkirc2/.data ${WRKSRC}/.tkirc2/DOTdata
+	${CP} -r ${WRKSRC}/.tkirc2 ${EXAMPLESDIR}/DOTtkirc2
+.endif
 
 .include <bsd.port.mk>
diff --git a/irc/tkirc/pkg-plist b/irc/tkirc/pkg-plist
index 897ed3c7bf5b..710e7c256cb1 100644
--- a/irc/tkirc/pkg-plist
+++ b/irc/tkirc/pkg-plist
@@ -1,21 +1,19 @@
 bin/tkirc
 bin/tkirc2
-share/doc/tkirc/CHANGES
-share/doc/tkirc/COPYING
-share/doc/tkirc/README
-@exec mkdir -p %D/share/doc/tkirc/examples/.tkirc2/.data
-@exec mkdir -p %D/share/doc/tkirc/examples/.tkirc2/autoload
-share/doc/tkirc/examples/.tkirc2/netscape.sh
-share/doc/tkirc/examples/.tkirc2/tkircrc-example
-share/doc/tkirc/examples/.tkirc2/scripts/crazy1.tcl
-share/doc/tkirc/examples/.tkirc2/scripts/crazy2.tcl
-share/doc/tkirc/examples/.tkirc2/scripts/crazy3.tcl
-share/doc/tkirc/examples/.tkirc2/scripts/examples.tcl
-share/doc/tkirc/examples/.tkirc2/scripts/hilo.tcl
-share/doc/tkirc/examples/.tkirc2/scripts/sound.tcl
-@dirrm share/doc/tkirc/examples/.tkirc2/.data
-@dirrm share/doc/tkirc/examples/.tkirc2/autoload
-@dirrm share/doc/tkirc/examples/.tkirc2/scripts
-@dirrm share/doc/tkirc/examples/.tkirc2
-@dirrm share/doc/tkirc/examples
-@dirrm share/doc/tkirc
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/DOTtkirc2/netscape.sh
+%%PORTDOCS%%%%EXAMPLESDIR%%/DOTtkirc2/tkircrc-example
+%%PORTDOCS%%%%EXAMPLESDIR%%/DOTtkirc2/scripts/crazy1.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/DOTtkirc2/scripts/crazy2.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/DOTtkirc2/scripts/crazy3.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/DOTtkirc2/scripts/examples.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/DOTtkirc2/scripts/hilo.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/DOTtkirc2/scripts/sound.tcl
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/DOTtkirc2/DOTdata
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/DOTtkirc2/autoload
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/DOTtkirc2/scripts
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/DOTtkirc2
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%