diff --git a/net/xchat2/Makefile b/net/xchat2/Makefile
index 1710abf64e5..c82e1031462 100644
--- a/net/xchat2/Makefile
+++ b/net/xchat2/Makefile
@@ -1,17 +1,13 @@
-# $OpenBSD: Makefile,v 1.4 2003/08/08 20:28:30 couderc Exp $
+# $OpenBSD: Makefile,v 1.5 2003/12/08 03:32:01 margarida Exp $
 
 COMMENT=	"GTK+2 IRC client"
 
 MAJOR=		2.0
-VERSION=	${MAJOR}.4
+VERSION=	${MAJOR}.6
 DISTNAME=	xchat-${VERSION}
 PKGNAME=	xchat2-${VERSION}
 CATEGORIES=	net x11
 
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xchat/}
-
-EXTRACT_SUFX=	.tar.bz2
-
 HOMEPAGE=	http://www.xchat.org/
 
 MAINTAINER=	Damien Couderc <couderc@openbsd.org>
@@ -21,6 +17,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=	${HOMEPAGE}files/source/2.0/
+MASTER_SITES0=	${MASTER_SITE_SOURCEFORGE:=xchat/}
+
+EXTRACT_SUFX=	.tar.bz2
+
 LIB_DEPENDS=	gtk-x11-2.0.0.0,gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0::x11/gtk+2
 
 MODULES=	gettext
diff --git a/net/xchat2/distinfo b/net/xchat2/distinfo
index c558a4219a5..632ff9f2748 100644
--- a/net/xchat2/distinfo
+++ b/net/xchat2/distinfo
@@ -1,3 +1,3 @@
-MD5 (xchat-2.0.4.tar.bz2) = bd987cd3b49cc16e875cfd8cb9b77c29
-RMD160 (xchat-2.0.4.tar.bz2) = ffc9e35dde60613d16101b3e875ff0cda9bc992c
-SHA1 (xchat-2.0.4.tar.bz2) = fb2692cfdd5345fe39b95143f57222eca33f8b75
+MD5 (xchat-2.0.6.tar.bz2) = 5cc5e603083242fb598bc940b1a4fccc
+RMD160 (xchat-2.0.6.tar.bz2) = c5d44abaafee32e609e0020fbe03e34f8e940d4c
+SHA1 (xchat-2.0.6.tar.bz2) = d554b3f8360cf384464053155fbd1eb6f446ec44
diff --git a/net/xchat2/patches/patch-configure b/net/xchat2/patches/patch-configure
index 540e841f169..9bc51ba9b1e 100644
--- a/net/xchat2/patches/patch-configure
+++ b/net/xchat2/patches/patch-configure
@@ -1,12 +1,12 @@
-$OpenBSD: patch-configure,v 1.2 2003/08/08 05:47:38 marcm Exp $
---- configure.orig	2003-07-30 22:24:30.000000000 -0700
-+++ configure	2003-08-07 22:37:15.000000000 -0700
-@@ -1760,7 +1760,7 @@ fi
+$OpenBSD: patch-configure,v 1.3 2003/12/08 03:32:02 margarida Exp $
+--- configure.orig	2003-12-06 15:26:04.000000000 +0100
++++ configure	2003-12-06 15:25:35.000000000 +0100
+@@ -1761,7 +1761,7 @@ fi
  
  
  # Define the identity of the package.
 - PACKAGE=xchat
 + PACKAGE=xchat2
-  VERSION=2.0.4
+  VERSION=2.0.6
  
  
diff --git a/net/xchat2/pkg/PLIST b/net/xchat2/pkg/PLIST
index f8c2bddf0a7..23c33c2fbe8 100644
--- a/net/xchat2/pkg/PLIST
+++ b/net/xchat2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/08/08 20:20:41 couderc Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/12/08 03:32:02 margarida Exp $
 bin/xchat2
 bin/xchat2-text
 share/applications/xchat2.desktop
@@ -8,6 +8,7 @@ share/locale/de/LC_MESSAGES/xchat2.mo
 share/locale/el/LC_MESSAGES/xchat2.mo
 share/locale/es/LC_MESSAGES/xchat2.mo
 share/locale/et/LC_MESSAGES/xchat2.mo
+share/locale/fi/LC_MESSAGES/xchat2.mo
 share/locale/fr/LC_MESSAGES/xchat2.mo
 share/locale/ja/LC_MESSAGES/xchat2.mo
 share/locale/lt/LC_MESSAGES/xchat2.mo
@@ -18,6 +19,7 @@ share/locale/no/LC_MESSAGES/xchat2.mo
 share/locale/pt/LC_MESSAGES/xchat2.mo
 share/locale/sk/LC_MESSAGES/xchat2.mo
 share/locale/sl/LC_MESSAGES/xchat2.mo
+share/locale/sr/LC_MESSAGES/xchat2.mo
 share/locale/sv/LC_MESSAGES/xchat2.mo
 share/locale/zh_CN/LC_MESSAGES/xchat2.mo
 share/pixmaps/xchat2.png
@@ -26,6 +28,8 @@ share/pixmaps/xchat2.png
 @comment @dirrm share/locale/zh_CN
 @comment @dirrm share/locale/sv/LC_MESSAGES
 @comment @dirrm share/locale/sv
+@comment @dirrm share/locale/sr/LC_MESSAGES
+@comment @dirrm share/locale/sr
 @comment @dirrm share/locale/sl/LC_MESSAGES
 @comment @dirrm share/locale/sl
 @comment @dirrm share/locale/sk/LC_MESSAGES
@@ -46,6 +50,8 @@ share/pixmaps/xchat2.png
 @comment @dirrm share/locale/ja
 @comment @dirrm share/locale/fr/LC_MESSAGES
 @comment @dirrm share/locale/fr
+@comment @dirrm share/locale/fi/LC_MESSAGES
+@comment @dirrm share/locale/fi
 @comment @dirrm share/locale/et/LC_MESSAGES
 @comment @dirrm share/locale/et
 @comment @dirrm share/locale/es/LC_MESSAGES