--- gtkspell3/docs/Makefile.am	2004-08-25 17:00:25.000000000 -0400
+++ gtkspell3/docs/Makefile.am	2005-04-05 15:07:23.000000000 -0400
@@ -58,7 +58,7 @@ 
 # Everything below here is generic and you shouldn't need to change it.
 ###########################################################################
 
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-3.0
 
 EXTRA_DIST = 				\
 	$(content_files)		\
--- gtkspell3/docs/gtkspell-docs.sgml	2004-08-25 17:00:25.000000000 -0400
+++ gtkspell3/docs/gtkspell-docs.sgml	2005-04-05 18:36:23.000000000 -0400
@@ -7,7 +7,7 @@ 
 <!-- vim: set ts=8 sw=2 : -->
 <book id="index">
   <bookinfo>
-    <title>GtkSpell Manual</title>
+    <title>GtkSpell 3.0 Manual</title>
     <author><firstname>Evan</firstname><surname>Martin</surname></author>
   </bookinfo>
 
--- gtkspell3/configure.ac	2005-03-03 22:17:15.000000000 -0500
+++ gtkspell3/configure.ac	2005-04-05 17:49:47.000000000 -0400
@@ -4,12 +4,9 @@ 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
 
-SPELLER_LIB=-lenchant      
-      
-AC_SUBST(SPELLER_LIB)
-GTKSPELL_PACKAGES=gtk+-2.0
+GTKSPELL_PACKAGES="gtk+-2.0 enchant >= 1.1.6"
 AC_SUBST(GTKSPELL_PACKAGES)
-PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES enchant >= 0.4.0)
+PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES)
 AC_SUBST(GTKSPELL_CFLAGS)
 AC_SUBST(GTKSPELL_LIBS)
 
@@ -28,7 +28,7 @@ 
 # gettext 
 ALL_LINGUAS="be de el eo es eu fr ga it ja mn nl pl pt_BR rm ro sk sr vi wa zh_CN"
 AM_GLIB_GNU_GETTEXT
-GETTEXT_PACKAGE=$PACKAGE
+GETTEXT_PACKAGE=gtkspell-3.0
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain])
 
--- gtkspell3/gtkspell-3.0.pc.in	2004-08-25 17:28:13.000000000 -0400
+++ gtkspell3/gtkspell-3.0.pc.in	2005-04-05 13:26:05.000000000 -0400
@@ -7,6 +7,6 @@ 
 Description: GTK spelling library
 Version: @VERSION@
 Requires: @GTKSPELL_PACKAGES@
-Libs: -L${libdir} -lgtkspell @SPELLER_LIB@
+Libs: -L${libdir} -lgtkspell-3.0
 Cflags: -I${includedir}/gtkspell-3.0
 
--- gtkspell3/examples/Makefile.am	2004-08-25 17:00:25.000000000 -0400
+++ gtkspell3/examples/Makefile.am	2005-04-05 12:22:18.000000000 -0400
@@ -1,5 +1,5 @@ 
 noinst_PROGRAMS = simple advanced
-AM_CFLAGS = @GTKSPELL_CFLAGS@ -I$(top_builddir)
-LDADD = @GTKSPELL_LIBS@ $(top_builddir)/gtkspell/libgtkspell.la
+INCLUDES = $(GTKSPELL_CFLAGS) -I$(top_builddir)
+LDADD = $(top_builddir)/gtkspell/libgtkspell-3.0.la $(GTKSPELL_LIBS)
 simple_SOURCES = simple.c
 advanced_SOURCES = advanced.c
--- gtkspell3/gtkspell/Makefile.am	2004-08-25 17:28:14.000000000 -0400
+++ gtkspell3/gtkspell/Makefile.am	2005-04-05 12:24:05.000000000 -0400
@@ -1,6 +1,6 @@ 
-lib_LTLIBRARIES=libgtkspell.la
-AM_CFLAGS=@GTKSPELL_CFLAGS@ -DG_LOG_DOMAIN=\"gtkspell\" -DLOCALEDIR=\""$(datadir)/locale"\"
-libgtkspell_la_LIBADD=@GTKSPELL_LIBS@ @SPELLER_LIB@
-libgtkspell_la_includedir=$(includedir)/gtkspell-3.0/gtkspell
-libgtkspell_la_include_HEADERS=gtkspell.h
-libgtkspell_la_SOURCES=gtkspell.c deprecated.c gtkspell.h
+INCLUDES = $(GTKSPELL_CFLAGS) -DG_LOG_DOMAIN=\"gtkspell\" -DLOCALEDIR=\""$(datadir)/locale"\"
+lib_LTLIBRARIES = libgtkspell-3.0.la
+libgtkspell_3_0_la_LIBADD = $(GTKSPELL_LIBS)
+libgtkspell_3_0_la_includedir = $(includedir)/gtkspell-3.0/gtkspell
+libgtkspell_3_0_la_include_HEADERS = gtkspell.h
+libgtkspell_3_0_la_SOURCES = gtkspell.c deprecated.c gtkspell.h