diff --git a/build/build-x86.bat b/build/build-x86.bat
index f6ab0e70..925739c1 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -2,7 +2,7 @@
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev32\include;c:\mozilla-build\build\openssl-1.0.0a-wdk-x86\include
 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\mozilla-build\build\openssl-1.0.0a-wdk-x86\lib
 set OPATH=%PATH%
-set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\mingw\bin;c:\mozilla-build\perl-5.10-x86\bin
+set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\mingw32\bin;c:\mozilla-build\perl-5.10-x86\bin
 cd ..\src
 nmake -f makefile.mak clean
 nmake -f makefile.mak
diff --git a/config.h b/config.h
index ada5a1ed..e6276f71 100644
--- a/config.h
+++ b/config.h
@@ -2,8 +2,11 @@
 #define ENABLE_NLS
 #define USE_GMODULE
 #define USE_PLUGIN
+/*#ifndef _WIN64
+#define USE_GTKSPELL
+#endif*/
 #define PACKAGE_NAME "xchat"
-#define PACKAGE_VERSION "r1451-6"
+#define PACKAGE_VERSION "r1451-7"
 #define XCHATLIBDIR "."
 #define XCHATSHAREDIR "."
 #define OLD_PERL
diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak
index 3ce9cb5b..f5198181 100644
--- a/src/fe-gtk/makefile.mak
+++ b/src/fe-gtk/makefile.mak
@@ -15,7 +15,7 @@ mmx_cmod.o: mmx_cmod.S
 	gcc -DUNDERSCORE_SYMBOLS -c mmx_cmod.S
 
 .c.obj:
-	$(CC) $(CFLAGS) $(GLIB) $(GTK) $<
+	$(CC) $(CFLAGS) $(GLIB) $(GTK) $(SPELL) $<
 
 $(PROG): $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj
 	$(LINK) /out:$(PROG) /ENTRY:mainCRTStartup $(LDFLAGS) $(LIBS) $(FEGTK_OBJECTS) $(COMLIB) xchat-icon.obj
diff --git a/src/makeinc.mak b/src/makeinc.mak
index e1204c2b..36f4d903 100644
--- a/src/makeinc.mak
+++ b/src/makeinc.mak
@@ -31,6 +31,9 @@ GLIB = -Ic:/mozilla-build/build/xchat-dev32/include/glib-2.0 -Ic:/mozilla-build/
 GTK = -Ic:/mozilla-build/build/xchat-dev32/include/gtk-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/gtk-2.0/include -Ic:/mozilla-build/build/xchat-dev32/include/atk-1.0 -Ic:/mozilla-build/build/xchat-dev32/include/cairo -Ic:/mozilla-build/build/xchat-dev32/include/pango-1.0 -Ic:/mozilla-build/build/xchat-dev32/include/glib-2.0 -Ic:/mozilla-build/build/xchat-dev32/lib/glib-2.0/include -Ic:/mozilla-build/build/xchat-dev32/include/freetype2 -Ic:/mozilla-build/build/xchat-dev32/include -Ic:/mozilla-build/build/xchat-dev32/include/libpng14
 LIBS = $(LIBS) /libpath:c:/mozilla-build/build/xchat-dev32/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
 
+SPELL = -Ic:\mozilla-build\build\gtkspell-x86\include\gtkspell-2.0
+#LIBS = $(LIBS) /libpath:c:\mozilla-build\build\gtkspell-x86\lib libgtkspell.a
+
 LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj
 
 LUAPATH = c:\mozilla-build\lua-5.1-x86