diff --git a/irc/Makefile b/irc/Makefile
index a5e795d4eb5e..fbe202cdf91c 100644
--- a/irc/Makefile
+++ b/irc/Makefile
@@ -58,6 +58,7 @@
     SUBDIR += irssi-fish
     SUBDIR += irssi-scripts
     SUBDIR += irssi-xmpp
+    SUBDIR += irssi-xmpp-devel
     SUBDIR += irssistats
     SUBDIR += keitairc
     SUBDIR += kmyirc
diff --git a/irc/irssi-xmpp-devel/Makefile b/irc/irssi-xmpp-devel/Makefile
index c2d6179abb6f..5a7c9a159727 100644
--- a/irc/irssi-xmpp-devel/Makefile
+++ b/irc/irssi-xmpp-devel/Makefile
@@ -1,32 +1,36 @@
 # New ports collection makefile for:   irssi-xmpp
-# Date created:                11 September 2007
+# Date created:                14 December 2007
 # Whom:                        Philippe Audeoud <jadawin@tuxaco.net>
 # $FreeBSD$
 
 PORTNAME=	irssi-xmpp
-PORTVERSION=	0.13
+PORTVERSION=	20071214
 CATEGORIES=	irc
-MASTER_SITES=	http://cybione.org/src/irssi-xmpp/
+MASTER_SITES=	http://jadawin.tuxaco.net/freebsd/irssi-xmpp-snapshot/
+PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION}
 
 MAINTAINER=	jadawin@tuxaco.net
-COMMENT=	Irssi-xmpp is an irssi plugin to connect to the Jabber network
+COMMENT=	Irssi-xmpp-snaposhot is the irssi-xmmp cvs snapshot
 
 BUILD_DEPENDS=	irssi:${PORTSDIR}/irc/irssi
 RUN_DEPENDS=	irssi:${PORTSDIR}/irc/irssi
 LIB_DEPENDS=	loudmouth:${PORTSDIR}/net-im/loudmouth
 
+WRKSRC=	${WRKDIR}/${DISTNAME}
+
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 MAKE_ENV=	IRSSI_INCLUDE="${LOCALBASE}/include/irssi/"
 
 PLIST_FILES=	lib/irssi/modules/libfe_xmpp.so \
-		lib/irssi/modules/libxmpp_core.so
-PORTDOCS=	README
+		lib/irssi/modules/libxmpp_core.so \
+		lib/irssi/modules/libtext_xmpp.so
 
-IGNORE=		Does not work with irc/irssi-0.8.12
+PORTDOCS=	README FAQ GENERAL MUC STARTUP XEP
 
 do-install:
-.for data in core fe-common
+.for data in core fe-common fe-text
 	${MKDIR} ${PREFIX}/lib/irssi/modules
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${data}/*.so \
 		${PREFIX}/lib/irssi/modules
@@ -34,6 +38,9 @@ do-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.for i in FAQ GENERAL MUC STARTUP XEP
+	${INSTALL_DATA} ${WRKSRC}/docs/$i ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/irc/irssi-xmpp-devel/distinfo b/irc/irssi-xmpp-devel/distinfo
index 0613353f19bc..faf3c1da9b14 100644
--- a/irc/irssi-xmpp-devel/distinfo
+++ b/irc/irssi-xmpp-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (irssi-xmpp-0.13.tar.gz) = be2dab63a3ef5d86c3be9d5ff02f26fe
-SHA256 (irssi-xmpp-0.13.tar.gz) = 0f6741c702222390d337c03b17ff65ed61a932fcd98780b5ffafbfdabf6eefa7
-SIZE (irssi-xmpp-0.13.tar.gz) = 25074
+MD5 (irssi-xmpp-snapshot-20071214.tar.gz) = 53619a11dd5c115a7dac192cac087299
+SHA256 (irssi-xmpp-snapshot-20071214.tar.gz) = a01ef106da483c925df99a657745e5ffa7512d7ca27a0186404c6e309cafe094
+SIZE (irssi-xmpp-snapshot-20071214.tar.gz) = 55092