diff --git a/src/makeinc.mak b/src/makeinc.mak
index 512c2f85..7a719967 100644
--- a/src/makeinc.mak
+++ b/src/makeinc.mak
@@ -16,7 +16,7 @@ GLIB = -Ic:/mozilla-build/build/xchat-dev64/include/glib-2.0 -Ic:/mozilla-build/
 GTK = -Ic:/mozilla-build/build/xchat-dev64/include/gtk-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/gtk-2.0/include -Ic:/mozilla-build/build/xchat-dev64/include/atk-1.0 -Ic:/mozilla-build/build/xchat-dev64/include/cairo -Ic:/mozilla-build/build/xchat-dev64/include/pango-1.0 -Ic:/mozilla-build/build/xchat-dev64/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev64/lib/glib-2.0/include -Ic:/mozilla-build/build/xchat-dev64/include/freetype2 -Ic:/mozilla-build/build/xchat-dev64/include -Ic:/mozilla-build/build/xchat-dev64/include/libpng14
 LIBS = $(LIBS) /libpath:c:/mozilla-build/build/xchat-dev64/lib gtk-win32-2.0.lib gdk-win32-2.0.lib atk-1.0.lib gio-2.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib gdi32.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib
 
-CFLAGS = $(CFLAGS) /favor:AMD64
+CFLAGS = $(CFLAGS) /favor:AMD64 /D_WIN64
 CPPFLAGS = $(CPPFLAGS) /favor:AMD64 /D_WIN64
 LDFLAGS = $(LDFLAGS) msvcrt_win2003.obj
 
diff --git a/xchat-wdk.patch b/xchat-wdk.patch
index b87eaedb..aa9e95f3 100644
--- a/xchat-wdk.patch
+++ b/xchat-wdk.patch
@@ -75,7 +75,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/p
  #include "xchat-plugin.h"
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src/common/cfgfiles.c
 --- xchat-wdk.orig/src/common/cfgfiles.c	2009-01-02 06:56:12 +0100
-+++ xchat-wdk/src/common/cfgfiles.c	2010-05-02 20:18:12 +0200
++++ xchat-wdk/src/common/cfgfiles.c	2010-05-02 20:40:22 +0200
 @@ -17,7 +17,6 @@
   */
  
@@ -84,7 +84,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src
  #include <stdlib.h>
  #include <string.h>
  #include <stdio.h>
-@@ -670,14 +669,14 @@
+@@ -670,14 +669,19 @@
  	prefs.autoopendccchatwindow = 1;
  	prefs.userhost = 1;
  	prefs.gui_url_mod = 4;	/* ctrl */
@@ -95,8 +95,13 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src
  	prefs.mainwindow_save = 1;
  	prefs.bantype = 2;
  	prefs.input_balloon_time = 20;
++	/* taskbar alerts crash xchat-wdk only on x86 */
++#ifdef _WIN64
  	prefs.input_flash_priv = prefs.input_flash_hilight = 1;
 -	prefs.input_tray_priv = prefs.input_tray_hilight = 1;
++#else
++	prefs.input_flash_priv = prefs.input_flash_hilight = prefs.input_flash_chans = 0;
++#endif
 +	prefs.input_tray_priv = prefs.input_tray_hilight = prefs.input_tray_chans = 0;
  	prefs.autodccsend = 2;	/* browse mode */
  #ifdef WIN32
@@ -760,8 +765,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/f
  #include "fe-gtk.h"
 diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe-gtk/setup.c
 --- xchat-wdk.orig/src/fe-gtk/setup.c	2008-02-08 10:04:45 +0100
-+++ xchat-wdk/src/fe-gtk/setup.c	2010-05-02 20:20:48 +0200
-@@ -332,11 +332,13 @@
++++ xchat-wdk/src/fe-gtk/setup.c	2010-05-02 20:41:31 +0200
+@@ -332,11 +332,16 @@
  #ifndef WIN32
  	{ST_3OGGLE, N_("Show tray balloons on:"), 0, 0, (void *)balloonlist, 0},
  #endif
@@ -769,7 +774,10 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe
 +	/* we don't use the xchat plugin-tray */
 +	/* {ST_3OGGLE, N_("Blink tray icon on:"), 0, 0, (void *)trayblinklist, 0}, */
 +
++	/* taskbar alerts crash xchat-wdk only on x86 */
++#ifdef _WIN64
  	{ST_3OGGLE, N_("Blink task bar on:"), 0, 0, (void *)taskbarlist, 0},
++#endif
  	{ST_3OGGLE, N_("Make a beep sound on:"), 0, 0, (void *)beeplist, 0},
  
 -	{ST_TOGGLE,	N_("Enable system tray icon"), P_OFFINTNL(gui_tray), 0, 0, 0},