Index: enchant-1.3.0/configure.in
===================================================================
--- enchant-1.3.0.orig/configure.in
+++ enchant-1.3.0/configure.in
@@ -114,7 +114,13 @@ AC_ARG_ENABLE(myspell, [  --disable-mysp
 if test "x$have_cxx" = "xno"; then
    build_myspell=no
 fi
-AM_CONDITIONAL(WITH_MYSPELL, test "x$build_myspell" = "xyes")
+
+if test "x$build_myspell" = "xexternal"; then
+   PKG_CHECK_MODULES([HUNSPELL], [hunspell >= 1.1.9])
+fi
+
+AM_CONDITIONAL(WITH_SYSTEM_HUNSPELL, test "x$build_myspell" = "xexternal")
+AM_CONDITIONAL(WITH_MYSPELL, test "x$build_myspell" != "xno")
 
 myspell_dir=${datadir}/enchant/myspell
 AC_ARG_WITH(myspell-dir, [  --with-myspell-dir=PATH    path to installed myspell dicts ])
@@ -123,13 +129,7 @@ if test "x$with_myspell_dir" != "x" ; th
    myspell_dir=$with_myspell_dir
 fi
 
-MYSPELL_CFLAGS="$MYSPELL_CFLAGS -DENCHANT_MYSPELL_DICT_DIR='\"$myspell_dir\"'"
-if test "x$with_system_myspell" != "xno"; then
-   MYSPELL_CFLAGS="$MYSPELL_CFLAGS -DWITH_SYSTEM_MYSPELL=1"
-fi
-
-AC_SUBST(MYSPELL_CFLAGS)
-AC_SUBST(MYSPELL_LIBS)
+HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS -DENCHANT_MYSPELL_DICT_DIR='\"$myspell_dir\"'"
 
 check_aspell=yes
 build_aspell=no
Index: enchant-1.3.0/src/myspell/Makefile.am
===================================================================
--- enchant-1.3.0.orig/src/myspell/Makefile.am
+++ enchant-1.3.0/src/myspell/Makefile.am
@@ -4,16 +4,17 @@ else
 target_lib =
 endif
 
-INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) $(MYSPELL_CFLAGS) -D_ENCHANT_BUILD=1
+INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) -D_ENCHANT_BUILD=1
 
 myspell_LTLIBRARIES = $(target_lib)
 myspelldir= $(libdir)/enchant
 
 libenchant_myspell_lalibdir=$(libdir)/enchant
-libenchant_myspell_la_LIBADD= $(MYSPELL_LIBS) $(ENCHANT_LIBS) $(top_builddir)/src/libenchant.la
+libenchant_myspell_la_LIBADD= $(HUNSPELL_LIBS) $(ENCHANT_LIBS) $(top_builddir)/src/libenchant.la
 libenchant_myspell_la_LDFLAGS = -module -avoid-version -no-undefined
 
-libenchant_myspell_la_SOURCES =	\
+if !WITH_SYSTEM_HUNSPELL
+hunspell_sources = \
 	affentry.hxx		\
 	affixmgr.hxx		\
 	atypes.hxx		\
@@ -31,7 +32,11 @@ libenchant_myspell_la_SOURCES =	\
 	dictmgr.cxx		\
 	hashmgr.cxx		\
 	hunspell.cxx		\
-	suggestmgr.cxx		\
+	suggestmgr.cxx
+endif
+
+libenchant_myspell_la_SOURCES =	\
+	$(hunspell_sources)	\
 	myspell_checker.cpp
 
 EXTRA_DIST=			\