diff -urN /usr/ports/polish/kadu/Makefile kadu/Makefile
--- /usr/ports/polish/kadu/Makefile	Sat Sep 23 19:31:19 2006
+++ kadu/Makefile	Fri Nov  3 13:29:46 2006
@@ -7,11 +7,16 @@
 
 PORTNAME=		kadu
 PORTVERSION=		0.4.3
-PORTREVISION=		1
+PORTREVISION=		2
 PORTEPOCH=		1
 CATEGORIES=		polish net-im
-MASTER_SITES=		http://www.kadu.net/download/stable/
-DISTNAME=		${PORTNAME}-${PORTVERSION}
+MASTER_SITES=		http://www.kadu.net/download/stable/:kadu \
+			http://michal.gov.one.pl/tabs/:tabs \
+			http://scripts.one.pl/spellchecker/stable/${PORTVERSION}/:aspell
+
+DISTFILES=		${PORTNAME}-${PORTVERSION}.tar.bz2:kadu
+TABS_MOD_DISTFILE= 	tabs-kadu-0.4.0.tar.gz
+ASPELL_MOD_DISTFILE=	spellchecker-0.15.tar.gz
 
 MAINTAINER=		mwisnicki+freebsd@gmail.com
 COMMENT=		QT Gadu-Gadu client
@@ -31,14 +36,69 @@
 
 USE_QT_VER=		3
 QT_NONSTANDARD=		yes
+WANT_GNOME=		yes
+INSTALLS_ICONS=		yes
+EXTRACT_ONLY=		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 WRKSRC=			${WRKDIR}/${PORTNAME}
 
+OPTIONS=	ASPELL	"Build spell checking module"	off \
+		ARTS	"Build aRts sound module"	off \
+		ESOUND	"Build Esound module"		off \
+		TABS	"Build tabs module"		off
+
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
+.if defined(WITH_ASPELL)
+LIB_DEPENDS+=	pspell.16:${PORTSDIR}/textproc/aspell
+PLIST_SUB+=	ASPELL_MOD=""
+DISTFILES+=	${ASPELL_MOD_DISTFILE}:aspell
+.else
+PLIST_SUB+=	ASPELL_MOD="@comment "
+.endif
+
+.if defined(WITH_ARTS)
+LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+PLIST_SUB+=	ARTS_MOD=""
+.else
+PLIST_SUB+=	ARTS_MOD="@comment "
+.endif
+
+.if defined(WITH_ESOUND)
+USE_GNOME+=	esound
+PLIST_SUB+=	ESOUND_MOD=""
+.else
+PLIST_SUB+=	ESOUND_MOD="@comment "
+.endif
+
+.if defined(WITH_TABS)
+PLIST_SUB+=	TABS_MOD=""
+DISTFILES+=	${TABS_MOD_DISTFILE}:tabs
+.else
+PLIST_SUB+=	TABS_MOD="@comment "
+.endif
+
 post-patch:
+.if ${OSVERSION} < 500000
 	@${ECHO} "MODULE_LDFLAGS=\"-lcrypto\"" >> ${WRKSRC}/modules/encryption/spec
+.endif
+
+.if defined(WITH_ASPELL)
+	@${REINPLACE_CMD} -e 's|module_spellchecker=n|module_spellchecker=y|g' ${WRKSRC}/.config
+	@cd ${WRKSRC}/modules && ${TAR} -zxf ${DISTDIR}/${ASPELL_MOD_DISTFILE}
+.endif
+
+.if defined(WITH_ARTS)
+	@${REINPLACE_CMD} -e 's|module_arts_sound=n|module_arts_sound=y|g' ${WRKSRC}/.config
+.endif
+
+.if defined(WITH_ESOUND)
+	@${REINPLACE_CMD} -e 's|module_esd_sound=n|module_esd_sound=y|g' ${WRKSRC}/.config
+.endif
+
+.if defined(WITH_TABS)
+	@${REINPLACE_CMD} -e 's|module_tabs=n|module_tabs=y|g' ${WRKSRC}/.config
+	@cd ${WRKSRC}/modules && ${TAR} -zxf ${DISTDIR}/${TABS_MOD_DISTFILE}
 .endif
 
 post-install:
diff -urN /usr/ports/polish/kadu/distinfo kadu/distinfo
--- /usr/ports/polish/kadu/distinfo	Thu Dec 15 11:38:56 2005
+++ kadu/distinfo	Thu Nov  2 19:57:30 2006
@@ -1,3 +1,9 @@
 MD5 (kadu-0.4.3.tar.bz2) = ef66bd638df30aee6338aae3b22dd194
 SHA256 (kadu-0.4.3.tar.bz2) = 3790048e8883533a0bc89119261035759278c6392b4f934c3528b729699ac0ed
 SIZE (kadu-0.4.3.tar.bz2) = 1181830
+MD5 (spellchecker-0.15.tar.gz) = 02495130277cc8a48430535a4107708d
+SHA256 (spellchecker-0.15.tar.gz) = 820127b09a0c4c8c9e8e7c1124d4cde1860b21461d1c7744276be0ccc11751d9
+SIZE (spellchecker-0.15.tar.gz) = 9303
+MD5 (tabs-kadu-0.4.0.tar.gz) = 21eec41cfc0883f41a49850969eef328
+SHA256 (tabs-kadu-0.4.0.tar.gz) = 2e0e76528b0d4960b08e0afbb72b962d80b6e361945ab735319b9ebd170615c5
+SIZE (tabs-kadu-0.4.0.tar.gz) = 12125
diff -urN /usr/ports/polish/kadu/files/patch-autodownload kadu/files/patch-autodownload
--- /usr/ports/polish/kadu/files/patch-autodownload	Thu Jan  1 01:00:00 1970
+++ kadu/files/patch-autodownload	Fri Nov  3 00:17:11 2006
@@ -0,0 +1,8 @@
+--- varia/scripts/autodownload.orig	Fri Nov  3 00:16:11 2006
++++ varia/scripts/autodownload	Fri Nov  3 00:16:28 2006
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++exit 0
+ if test $# != 2; then
+ 	echo
+ 	echo "Downloads and unpacks Kadu module, icon theme, sound theme or other."
diff -urN /usr/ports/polish/kadu/pkg-plist kadu/pkg-plist
--- /usr/ports/polish/kadu/pkg-plist	Sun Jan 22 03:48:19 2006
+++ kadu/pkg-plist	Tue Oct 31 01:42:32 2006
@@ -559,6 +559,20 @@
 share/icons/hicolor/24x24/apps/kadu.png
 share/icons/hicolor/32x32/apps/kadu.png
 share/icons/hicolor/48x48/apps/kadu.png
+%%ARTS_MOD%%include/kadu/modules/player_arts.h
+%%ARTS_MOD%%share/kadu/modules/bin/arts_sound/arts_connector
+%%ARTS_MOD%%share/kadu/modules/arts_sound.desc
+%%ASPELL_MOD%%include/kadu/modules/spellchecker.h
+%%ASPELL_MOD%%share/kadu/modules/translations/spellchecker_pl.qm
+%%ASPELL_MOD%%share/kadu/modules/data/spellchecker/config.png
+%%ASPELL_MOD%%share/kadu/modules/spellchecker.desc
+%%ESOUND_MOD%%include/kadu/modules/esd_sound.h
+%%ESOUND_MOD%%share/kadu/modules/esd_sound.desc
+%%TABS_MOD%%include/kadu/modules/tabs.h
+%%TABS_MOD%%include/kadu/modules/tabwidget.h
+%%TABS_MOD%%share/kadu/modules/translations/tabs_pl.qm
+%%TABS_MOD%%share/kadu/modules/data/tabs/attach.png
+%%TABS_MOD%%share/kadu/modules/tabs.desc
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor/22x22/apps
@@ -586,7 +600,10 @@
 @dirrm %%DATADIR%%/modules/data/config_wizard/ronk2
 @dirrm %%DATADIR%%/modules/data/config_wizard/joi
 @dirrm %%DATADIR%%/modules/data/config_wizard
+%%ASPELL_MOD%%@dirrm %%DATADIR%%/modules/data/spellchecker
+%%TABS_MOD%%@dirrm %%DATADIR%%/modules/data/tabs
 @dirrm %%DATADIR%%/modules/data
+%%ARTS_MOD%%@dirrm %%DATADIR%%/modules/bin/arts_sound
 @dirrm %%DATADIR%%/modules/bin
 @dirrm %%DATADIR%%/modules
 @dirrm %%DATADIR%%