diff -p -up mozilla-thunderbird-2.0.0.14/mozilla/config/autoconf.mk.in.hunspell mozilla-thunderbird-2.0.0.14/mozilla/config/autoconf.mk.in
--- mozilla-thunderbird-2.0.0.14/mozilla/config/autoconf.mk.in.hunspell	2006-09-14 20:07:03.000000000 +0200
+++ mozilla-thunderbird-2.0.0.14/mozilla/config/autoconf.mk.in	2008-06-28 17:29:37.000000000 +0200
@@ -190,6 +190,10 @@ NECKO_DISK_CACHE = @NECKO_DISK_CACHE@
 NECKO_SMALL_BUFFERS = @NECKO_SMALL_BUFFERS@
 NECKO_COOKIES = @NECKO_COOKIES@
 
+MOZ_NATIVE_MYSPELL = @SYSTEM_MYSPELL@
+MOZ_MYSPELL_LIBS = @MOZ_MYSPELL_LIBS@
+MOZ_MYSPELL_CFLAGS = @MOZ_MYSPELL_CFLAGS@
+
 MOZ_NATIVE_ZLIB	= @SYSTEM_ZLIB@
 MOZ_NATIVE_JPEG	= @SYSTEM_JPEG@
 MOZ_NATIVE_PNG	= @SYSTEM_PNG@
diff -p -up mozilla-thunderbird-2.0.0.14/mozilla/configure.in.hunspell mozilla-thunderbird-2.0.0.14/mozilla/configure.in
--- mozilla-thunderbird-2.0.0.14/mozilla/configure.in.hunspell	2007-12-18 22:34:10.000000000 +0100
+++ mozilla-thunderbird-2.0.0.14/mozilla/configure.in	2008-06-28 17:29:37.000000000 +0200
@@ -3914,6 +3914,22 @@ fi
 
 fi # SKIP_LIBRARY_CHECKS
 
+dnl system MySpell Support
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(system-myspell,
+[  --enable-system-myspell   Use system myspell (located with pkgconfig)],
+    SYSTEM_MYSPELL=1 )
+
+if test -n "$SYSTEM_MYSPELL"; then
+    dnl PKG_CHECK_MODULES(MOZ_MYSPELL, myspell)
+    MOZ_MYSPELL_CFLAGS="-I/usr/include/hunspell -DMySpell=Hunspell"
+    MOZ_MYSPELL_LIBS="-lhunspell-1.2"
+fi
+
+AC_SUBST(SYSTEM_MYSPELL)
+AC_SUBST(MOZ_MYSPELL_LIBS)
+AC_SUBST(MOZ_MYSPELL_CFLAGS)
+
 dnl ========================================================
 dnl Java SDK support
 dnl ========================================================
diff -p -up mozilla-thunderbird-2.0.0.14/mozilla/extensions/spellcheck/myspell/src/Makefile.in.hunspell mozilla-thunderbird-2.0.0.14/mozilla/extensions/spellcheck/myspell/src/Makefile.in
--- mozilla-thunderbird-2.0.0.14/mozilla/extensions/spellcheck/myspell/src/Makefile.in.hunspell	2006-06-29 23:23:45.000000000 +0200
+++ mozilla-thunderbird-2.0.0.14/mozilla/extensions/spellcheck/myspell/src/Makefile.in	2008-06-28 17:29:37.000000000 +0200
@@ -60,15 +60,18 @@ REQUIRES	= xpcom \
 		  xulapp \
 		  $(NULL)
 
-CPPSRCS =         affentry.cpp \
-		  affixmgr.cpp \
-		  hashmgr.cpp \
-		  suggestmgr.cpp \
-		  csutil.cpp \
-		  myspell.cpp \
-		  mozMySpell.cpp \
-		  mozMySpellFactory.cpp \
+CPPSRCS =         mozMySpell.cpp \
+                  mozMySpellFactory.cpp \
                   $(NULL)
+ifndef MOZ_NATIVE_MYSPELL
+CPPSRCS +=        affentry.cpp \
+                  affixmgr.cpp \
+                  hashmgr.cpp \
+                  suggestmgr.cpp \
+                  csutil.cpp \
+                  myspell.cpp \
+                  $(NULL)
+endif
 
 ifdef MOZ_XUL_APP
 CPPSRCS += mozMySpellDirProvider.cpp
@@ -79,6 +82,11 @@ EXTRA_DSO_LDOPTS = \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
+		$(MOZ_MYSPELL_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_NATIVE_MYSPELL
+CXXFLAGS += $(MOZ_MYSPELL_CFLAGS)
+endif
diff -p -up mozilla-thunderbird-2.0.0.14/mozilla/extensions/spellcheck/myspell/src/mozMySpell.h.hunspell mozilla-thunderbird-2.0.0.14/mozilla/extensions/spellcheck/myspell/src/mozMySpell.h
--- mozilla-thunderbird-2.0.0.14/mozilla/extensions/spellcheck/myspell/src/mozMySpell.h.hunspell	2006-06-29 23:46:59.000000000 +0200
+++ mozilla-thunderbird-2.0.0.14/mozilla/extensions/spellcheck/myspell/src/mozMySpell.h	2008-06-28 17:29:37.000000000 +0200
@@ -56,7 +56,7 @@
 #ifndef mozMySpell_h__
 #define mozMySpell_h__
 
-#include "myspell.hxx"
+#include "hunspell.hxx"
 #include "mozISpellCheckingEngine.h"
 #include "mozIPersonalDictionary.h"
 #include "nsString.h"