diff --git a/net-im/jabber-pyicq/Makefile b/net-im/jabber-pyicq/Makefile
index bc307879aaec..03b3ecf7830e 100644
--- a/net-im/jabber-pyicq/Makefile
+++ b/net-im/jabber-pyicq/Makefile
@@ -1,88 +1,87 @@
 # New ports collection makefile for:	Jabber Python ICQ Transport
 # Date created:				2005-06-07
 # Whom:					Renato Botelho <freebsd@galle.com.br>
 #
 # $FreeBSD$
 
 PORTNAME=	pyicq
-PORTVERSION=	0.7b
-PORTREVISION=	2
+PORTVERSION=	0.8
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.blathersource.org/download.php/pyicq-t/
 PKGNAMEPREFIX=	jabber-
 PKGNAMESUFFIX=	-transport
 DISTNAME=	${PORTNAME}-t-${PORTVERSION}
 DIST_SUBDIR=	jabber
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Python ICQ-Transport for Jabber
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl \
 		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
 
 OPTIONS=	EJABBERD "Use transport with ejabberd" off \
 		TWISTED1 "Use old py-twisted 1.x" off
 
 NO_BUILD=	yes
 USE_PYTHON=	yes
 USE_RC_SUBR=	jabber-pyicq-transport.sh
 LOCAL_PYTHON=	${PYTHON_CMD}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_CMD=${LOCAL_PYTHON}
 
 INST_DIR=	${PREFIX}/lib/jabber/${PORTNAME}
 
 PORTDOCS=	COPYING README NEWS
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_EJABBERD)
 JABBER_USER?=	ejabberd
 SUB_LIST+=	JABBER_REQUIRE=ejabberd
 .else
 JABBER_USER?=	jabber
 SUB_LIST+=	JABBER_REQUIRE=jabberd
 .endif
 
 .if defined(WITH_TWISTED1)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twisted
 .else
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore \
 		${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb \
 		${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords
 .endif
 
 SUB_LIST+=	JABBER_USER=${JABBER_USER}
 
 post-patch:
 	@${REINPLACE_CMD} -i "" -e '/spooldir/s|\.|/var/spool/jabber|' \
 		-e '/pid/s|PyICQt.pid|/var/jabberd/pid/PyICQt.pid|' \
 		${WRKSRC}/config_example.xml
 	@${REINPLACE_CMD} -i "" -e 's,"config.xml","${PREFIX}/etc/jabber-pyicq.xml",' \
 		${WRKSRC}/src/main.py
 	@${REINPLACE_CMD} -i "" 's|^#!.*$$|#!${LOCAL_PYTHON}|' \
 		${WRKSRC}/PyICQt.py
 
 do-install:
 	${MKDIR} ${INST_DIR}/src ${INST_DIR}/data
 	${INSTALL_SCRIPT} ${WRKSRC}/PyICQt.py ${INST_DIR}
 	${INSTALL_DATA} ${WRKSRC}/data/defaultAIMAvatar.png ${INST_DIR}/data
 	${INSTALL_DATA} ${WRKSRC}/data/defaultICQAvatar.png ${INST_DIR}/data
 	@${CP} -Rv ${WRKSRC}/src/* ${INST_DIR}/src
 	@${FIND} ${INST_DIR}/src/ -type d -exec ${CHMOD} 755 "{}" \;
 	@${FIND} ${INST_DIR}/src/ -type f -exec ${CHMOD} 644 "{}" \;
 	@${MKDIR} ${EXAMPLESDIR}/etc
 	${INSTALL_DATA} ${WRKSRC}/config_example.xml ${EXAMPLESDIR}/etc/jabber-pyicq.xml
 	[ -f ${PREFIX}/etc/jabber-pyicq.xml ] || ${CP} ${EXAMPLESDIR}/etc/jabber-pyicq.xml ${PREFIX}/etc/jabber-pyicq.xml
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for portdoc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${portdoc} ${DOCSDIR}/
 .endfor
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net-im/jabber-pyicq/distinfo b/net-im/jabber-pyicq/distinfo
index 18b305506087..fe9b940e9636 100644
--- a/net-im/jabber-pyicq/distinfo
+++ b/net-im/jabber-pyicq/distinfo
@@ -1,3 +1,3 @@
-MD5 (jabber/pyicq-t-0.7b.tar.gz) = 7de0df9311eb6923e6f59fdd914bb6ab
-SHA256 (jabber/pyicq-t-0.7b.tar.gz) = abb0827d4711d361fdbba64181e21ceb2325d336ce95c5c67e3b1b5bec3b4dd2
-SIZE (jabber/pyicq-t-0.7b.tar.gz) = 139959
+MD5 (jabber/pyicq-t-0.8.tar.gz) = 0929aa4b726d8718e1b8c8cb900fa114
+SHA256 (jabber/pyicq-t-0.8.tar.gz) = ef914750f07ba74437230cd626a6248ff6a5d7b3fe777b2df3a8be8741c3f811
+SIZE (jabber/pyicq-t-0.8.tar.gz) = 163250
diff --git a/net-im/jabber-pyicq/pkg-plist b/net-im/jabber-pyicq/pkg-plist
index 8a59464f1b8d..c55bd94cbaff 100644
--- a/net-im/jabber-pyicq/pkg-plist
+++ b/net-im/jabber-pyicq/pkg-plist
@@ -1,77 +1,109 @@
 @comment $FreeBSD$
 @unexec if cmp -s %D/%%EXAMPLESDIR%%/etc/jabber-pyicq.xml %D/etc/jabber-pyicq.xml; then rm -f %D/etc/jabber-pyicq.xml; fi
 %%EXAMPLESDIR%%/etc/jabber-pyicq.xml
 @exec [ -f %D/etc/jabber-pyicq.xml ] || cp %B/%f %D/etc/jabber-pyicq.xml
 lib/jabber/pyicq/PyICQt.py
 lib/jabber/pyicq/data/defaultAIMAvatar.png
 lib/jabber/pyicq/data/defaultICQAvatar.png
+lib/jabber/pyicq/src/adhoc.py
 lib/jabber/pyicq/src/avatar.py
 lib/jabber/pyicq/src/bool.py
 lib/jabber/pyicq/src/config.py
 lib/jabber/pyicq/src/contact.py
-lib/jabber/pyicq/src/daemonize.py
 lib/jabber/pyicq/src/debug.py
 lib/jabber/pyicq/src/disco.py
 lib/jabber/pyicq/src/globals.py
 lib/jabber/pyicq/src/imgmanip.py
+lib/jabber/pyicq/src/iq.py
 lib/jabber/pyicq/src/jabw.py
 lib/jabber/pyicq/src/lang.py
 lib/jabber/pyicq/src/langs/sv.py
 lib/jabber/pyicq/src/langs/cs.py
 lib/jabber/pyicq/src/langs/de.py
 lib/jabber/pyicq/src/langs/en.py
 lib/jabber/pyicq/src/langs/es.py
 lib/jabber/pyicq/src/langs/fr.py
 lib/jabber/pyicq/src/langs/nl.py
 lib/jabber/pyicq/src/langs/pl.py
 lib/jabber/pyicq/src/langs/ru.py
 lib/jabber/pyicq/src/langs/__init__.py
 lib/jabber/pyicq/src/legacy/__init__.py
+lib/jabber/pyicq/src/legacy/buddies.py
 lib/jabber/pyicq/src/legacy/glue.py
 lib/jabber/pyicq/src/legacy/icqt.py
-lib/jabber/pyicq/src/legacy/legacyiq.py
-lib/jabber/pyicq/src/legacy/legacylist.py
+lib/jabber/pyicq/src/legacy/services/__init__.py
+lib/jabber/pyicq/src/legacy/services/ConfirmAccount.py
+lib/jabber/pyicq/src/legacy/services/EmailLookup.py
 lib/jabber/pyicq/src/main.py
-lib/jabber/pyicq/src/misciq.py
+lib/jabber/pyicq/src/pubsub.py
 lib/jabber/pyicq/src/register.py
 lib/jabber/pyicq/src/sasl.py
+lib/jabber/pyicq/src/services/__init__.py
+lib/jabber/pyicq/src/services/ConnectUsers.py
+lib/jabber/pyicq/src/services/EntityTime.py
+lib/jabber/pyicq/src/services/GatewayTranslator.py
+lib/jabber/pyicq/src/services/IqAvatarFactory.py
+lib/jabber/pyicq/src/services/LastActivity.py
+lib/jabber/pyicq/src/services/PingService.py
+lib/jabber/pyicq/src/services/RosterRetrieval.py
+lib/jabber/pyicq/src/services/SearchFactory.py
+lib/jabber/pyicq/src/services/Statistics.py
+lib/jabber/pyicq/src/services/VCardFactory.py
+lib/jabber/pyicq/src/services/VersionTeller.py
 lib/jabber/pyicq/src/session.py
+lib/jabber/pyicq/src/svninfo.py
 lib/jabber/pyicq/src/tlib/__init__.py
 lib/jabber/pyicq/src/tlib/countrycodes.py
-lib/jabber/pyicq/src/tlib/domish.py
-lib/jabber/pyicq/src/tlib/jabber/__init__.py
-lib/jabber/pyicq/src/tlib/jabber/client.py
-lib/jabber/pyicq/src/tlib/jabber/component.py
-lib/jabber/pyicq/src/tlib/jabber/jid.py
-lib/jabber/pyicq/src/tlib/jabber/jstrports.py
-lib/jabber/pyicq/src/tlib/jabber/xmpp_stringprep.py
+lib/jabber/pyicq/src/tlib/httpcompat.py
+lib/jabber/pyicq/src/tlib/ifcompat.py
 lib/jabber/pyicq/src/tlib/langcodes.py
 lib/jabber/pyicq/src/tlib/oscar.py
 lib/jabber/pyicq/src/tlib/scheduler.py
 lib/jabber/pyicq/src/tlib/socks5.py
 lib/jabber/pyicq/src/tlib/sockserror.py
-lib/jabber/pyicq/src/tlib/twistwrap.py
-lib/jabber/pyicq/src/tlib/xmlstream.py
+lib/jabber/pyicq/src/twistfix/__init__.py
+lib/jabber/pyicq/src/twistfix/README
+lib/jabber/pyicq/src/twistfix/version.py
+lib/jabber/pyicq/src/twistfix/words/__init__.py
+lib/jabber/pyicq/src/twistfix/words/protocols/__init__.py
+lib/jabber/pyicq/src/twistfix/words/protocols/jabber/__init__.py
+lib/jabber/pyicq/src/twistfix/words/protocols/jabber/client.py
+lib/jabber/pyicq/src/twistfix/words/protocols/jabber/component.py
+lib/jabber/pyicq/src/twistfix/words/protocols/jabber/jid.py
+lib/jabber/pyicq/src/twistfix/words/protocols/jabber/jstrports.py
+lib/jabber/pyicq/src/twistfix/words/protocols/jabber/xmpp_stringprep.py
+lib/jabber/pyicq/src/twistfix/words/xish/__init__.py
+lib/jabber/pyicq/src/twistfix/words/xish/domish.py
+lib/jabber/pyicq/src/twistfix/words/xish/utility.py
+lib/jabber/pyicq/src/twistfix/words/xish/xmlstream.py
+lib/jabber/pyicq/src/twistfix/words/xish/xpath.py
+lib/jabber/pyicq/src/twistfix/words/xish/xpathparser.py
 lib/jabber/pyicq/src/utils.py
 lib/jabber/pyicq/src/web/__init__.py
 lib/jabber/pyicq/src/web/handler.py
 lib/jabber/pyicq/src/web/xmppcred.py
 lib/jabber/pyicq/src/xdb/__init__.py
 lib/jabber/pyicq/src/xdb/legacyaimtransport.py
 lib/jabber/pyicq/src/xdb/legacyjittransport.py
 lib/jabber/pyicq/src/xdb/mysql.py
 lib/jabber/pyicq/src/xdb/template.py
 lib/jabber/pyicq/src/xdb/xmlfiles.py
 lib/jabber/pyicq/src/xmlconfig.py
 @dirrm lib/jabber/pyicq/src/langs
+@dirrm lib/jabber/pyicq/src/legacy/services
 @dirrm lib/jabber/pyicq/src/legacy
-@dirrm lib/jabber/pyicq/src/tlib/jabber
+@dirrm lib/jabber/pyicq/src/services
+@dirrm lib/jabber/pyicq/src/twistfix/words/xish
+@dirrm lib/jabber/pyicq/src/twistfix/words/protocols/jabber
+@dirrm lib/jabber/pyicq/src/twistfix/words/protocols
+@dirrm lib/jabber/pyicq/src/twistfix/words
+@dirrm lib/jabber/pyicq/src/twistfix
 @dirrm lib/jabber/pyicq/src/tlib
 @dirrm lib/jabber/pyicq/src/web
 @dirrm lib/jabber/pyicq/src/xdb
 @dirrm lib/jabber/pyicq/src
 @dirrm lib/jabber/pyicq/data
 @dirrm lib/jabber/pyicq
 @dirrmtry lib/jabber
 @dirrm %%EXAMPLESDIR%%/etc
 @dirrm %%EXAMPLESDIR%%