diff --git a/irc/irssi-xmpp/Makefile b/irc/irssi-xmpp/Makefile
index 7994d420b738..a959fcf8c330 100644
--- a/irc/irssi-xmpp/Makefile
+++ b/irc/irssi-xmpp/Makefile
@@ -1,55 +1,31 @@
 # Created by: Philippe Audeoud <jadawin@tuxaco.net>
 # $FreeBSD$
 
 PORTNAME=	irssi-xmpp
-PORTVERSION=	0.51
+PORTVERSION=	0.52
 CATEGORIES=	irc
 MASTER_SITES=	http://cybione.org/~irssi-xmpp/files/
 
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Irssi-xmpp is an irssi plugin to connect to the Jabber network
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	irssi:${PORTSDIR}/irc/irssi
 RUN_DEPENDS=	irssi:${PORTSDIR}/irc/irssi
 LIB_DEPENDS=	loudmouth:${PORTSDIR}/net-im/loudmouth
 
 USES=		pkgconfig
 USE_LDCONFIG=	yes
 
-PLIST_FILES=	lib/irssi/modules/libfe_xmpp.so \
-		lib/irssi/modules/libtext_xmpp.so \
-		lib/irssi/modules/libxmpp_core.so
-PORTDOCS=	README \
-		FAQ \
-		GENERAL \
-		INTERNAL \
-		MUC \
-		STARTUP \
-		XEP
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
 MAKE_JOBS_UNSAFE=yes
 
-post-configure:
-	@${REINPLACE_CMD} "/ggdb/d" ${WRKSRC}/config.mk
-
-do-install:
-.for data in core fe-common fe-text
-	${MKDIR} ${PREFIX}/lib/irssi/modules
-	${INSTALL_PROGRAM} ${WRKSRC}/src/${data}/*.so \
-		${PREFIX}/lib/irssi/modules
-.endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/GENERAL ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/INTERNAL ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/MUC ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/STARTUP ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/XEP ${DOCSDIR}
+.include <bsd.port.options.mk>
+
+post-patch:
+.if ! ${PORT_OPTIONS:MDOCS}
+	${REINPLACE_CMD} -e 's/ doc-install / /g' ${WRKSRC}/Makefile
 .endif
 
 .include <bsd.port.mk>
diff --git a/irc/irssi-xmpp/distinfo b/irc/irssi-xmpp/distinfo
index b05c71e2c405..e7026ca245a1 100644
--- a/irc/irssi-xmpp/distinfo
+++ b/irc/irssi-xmpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (irssi-xmpp-0.51.tar.gz) = 5f8c7f9d51856201b47647befd74eea8e7cecc1ed0ee52916dc15d9e623f686d
-SIZE (irssi-xmpp-0.51.tar.gz) = 67801
+SHA256 (irssi-xmpp-0.52.tar.gz) = c63975e0562e7ec6a1b68cb607829b3933ec822aa4a844c3d6dccf16f110dbdc
+SIZE (irssi-xmpp-0.52.tar.gz) = 68105
diff --git a/irc/irssi-xmpp/pkg-plist b/irc/irssi-xmpp/pkg-plist
new file mode 100644
index 000000000000..e4b36801f54c
--- /dev/null
+++ b/irc/irssi-xmpp/pkg-plist
@@ -0,0 +1,16 @@
+@comment $FreeBSD$
+%%DATADIR%%/help/roster
+%%DATADIR%%/help/xmppconnect
+%%DATADIR%%/help/xmppserver
+%%PORTDOCS%%%%DOCSDIR%%/irssi-xmpp/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/irssi-xmpp/GENERAL
+%%PORTDOCS%%%%DOCSDIR%%/irssi-xmpp/MUC
+%%PORTDOCS%%%%DOCSDIR%%/irssi-xmpp/STARTUP
+%%PORTDOCS%%%%DOCSDIR%%/irssi-xmpp/XEP
+lib/irssi/modules/libfe_xmpp.so
+lib/irssi/modules/libtext_xmpp.so
+lib/irssi/modules/libxmpp_core.so
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/irssi-xmpp
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrmtry %%DATADIR%%/help
+@dirrmtry %%DATADIR%%