diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 51f5e823659b..a4c5309177a4 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xchat
 PORTVERSION=	2.8.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
diff --git a/irc/xchat/files/patch-src_fe-gtk_fe-gtk.c b/irc/xchat/files/patch-src_fe-gtk_fe-gtk.c
new file mode 100644
index 000000000000..6573e33626fe
--- /dev/null
+++ b/irc/xchat/files/patch-src_fe-gtk_fe-gtk.c
@@ -0,0 +1,22 @@
+--- src/fe-gtk/fe-gtk.c.orig	2008-03-07 13:04:07.000000000 -0600
++++ src/fe-gtk/fe-gtk.c	2008-03-07 13:05:24.000000000 -0600
+@@ -660,7 +660,7 @@
+ 	session *sess;
+ 	gdouble per;
+ 	char lagtext[64];
+-	char lagtip[64];
++	char lagtip[128];
+ 	unsigned long nowtim;
+ 
+ 	if (lag == -1)
+@@ -716,8 +716,8 @@
+ 	GSList *list = sess_list;
+ 	struct session *sess;
+ 	float per;
+-	char tbuf[64];
+-	char tip[64];
++	char tbuf[96];
++	char tip[160];
+ 
+ 	per = (float) serv->sendq_len / 1024.0;
+ 	if (per > 1.0)