diff --git a/xchat-2.8.2-disable-tray-icon-by-default.patch b/xchat-2.8.2-disable-tray-icon-by-default.patch
new file mode 100644
index 0000000..79a6564
--- /dev/null
+++ b/xchat-2.8.2-disable-tray-icon-by-default.patch
@@ -0,0 +1,12 @@
+diff -ur xchat-2.8.2/src/common/cfgfiles.c xchat-2.8.2-disable-tray-icon-by-default/src/common/cfgfiles.c
+--- xchat-2.8.2/src/common/cfgfiles.c	2007-03-26 04:46:05.000000000 +0200
++++ xchat-2.8.2-disable-tray-icon-by-default/src/common/cfgfiles.c	2007-06-02 20:48:21.000000000 +0200
+@@ -663,7 +663,7 @@
+ 	prefs.autoopendccchatwindow = 1;
+ 	prefs.userhost = 1;
+ 	prefs.gui_url_mod = 4;	/* ctrl */
+-	prefs.gui_tray = 1;
++	prefs.gui_tray = 0;
+ 	prefs._gui_tray_blink = 0xfc920; /* 1111 1100 1001 0010 0000 */
+ 	prefs.mainwindow_save = 1;
+ 	prefs.bantype = 2;
diff --git a/xchat.spec b/xchat.spec
index 3745ff2..b475d66 100644
--- a/xchat.spec
+++ b/xchat.spec
@@ -3,7 +3,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.2
-Release:   7%{?dist}
+Release:   8%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -21,6 +21,8 @@ Patch19: xchat-2.0.2-freenode.patch
 Patch33: xchat-2.4.3-im_context_filter_keypress.patch
 # filed as 1262423 in the xchat bug tracker
 Patch34: xchat-2.4.4-unrealize.patch
+# see #241923
+Patch35: xchat-2.8.2-disable-tray-icon-by-default.patch
 
 BuildRequires: perl python-devel openssl-devel pkgconfig, tcl-devel
 BuildRequires: GConf2-devel
@@ -64,6 +66,7 @@ This package contains the X-Chat plugin providing the Tcl scripting interface.
 %patch19 -p0 -b .freenode
 %patch33 -p1 -b .im_context_filter_keypress
 %patch34 -p1 -b .unrealize
+%patch35 -p1 -b .tray-icon
 
 %build
 # Remove CVS files from source dirs so they're not installed into doc dirs.
@@ -148,6 +151,9 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Sat Jun  2 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1:2.8.2-8
+- disable tray icon by default (#241923)
+
 * Thu May 31 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1:2.8.2-7
 - revert to redhat-desktop patch pending further discussion