diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 26fa8623fe69..e205d7149f11 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	enchant
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.5
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://www.abisource.com/downloads/enchant/${PORTVERSION}/
 #		${MASTER_SITE_SOURCEFORGE}
@@ -30,7 +30,8 @@ MAN1=		enchant.1
 
 .ifndef(WITHOUT_ASPELL)
 LIB_DEPENDS+=	pspell.16:${PORTSDIR}/textproc/aspell
-CONFIGURE_ARGS+=--enable-aspell
+CONFIGURE_ARGS+=--enable-aspell \
+		--with-aspell-prefix=${LOCALBASE}
 PLIST_SUB+=	ASPELL=""
 .else
 CONFIGURE_ARGS+=--disable-aspell
@@ -39,10 +40,11 @@ PLIST_SUB+=	ASPELL="@comment "
 
 .include <bsd.port.pre.mk>
 
+# Disable, it needs hspell 0.9 or above.
 #.if exists(${LOCALBASE}/bin/hspell)
 #WITH_HSPELL=	yes
 #.endif
-
+#
 #.if defined(WITH_HSPELL)
 #BUILD_DEPENDS+=	hspell:${PORTSDIR}/hebrew/hspell
 #CONFIGURE_ARGS+=--enable-hspell
diff --git a/textproc/enchant/distinfo b/textproc/enchant/distinfo
index a1fb3879e8d0..2a6b6fe6d6c7 100644
--- a/textproc/enchant/distinfo
+++ b/textproc/enchant/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/enchant-1.2.3.tar.gz) = 9340451f33c71bd20cfe176c11975553
-SHA256 (gnome2/enchant-1.2.3.tar.gz) = 7ff11a7743bd202ca36142055aa3efa62b3cfaa3d754c70e233abd02a7208742
-SIZE (gnome2/enchant-1.2.3.tar.gz) = 532584
+MD5 (gnome2/enchant-1.2.5.tar.gz) = e64ec808ed2cb687c242ebb835faeb61
+SHA256 (gnome2/enchant-1.2.5.tar.gz) = 15348bf21125536b3bce1e477e50310e4b192c43c35476e949f41280bc7123d8
+SIZE (gnome2/enchant-1.2.5.tar.gz) = 532332
diff --git a/textproc/enchant/files/patch-configure b/textproc/enchant/files/patch-configure
new file mode 100644
index 000000000000..552e4320ad8a
--- /dev/null
+++ b/textproc/enchant/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Apr 14 13:58:45 2006
++++ configure	Fri Apr 14 13:59:09 2006
+@@ -21878,6 +21878,7 @@
+ 
+    ASPELL_CFLAGS=
+    if test "x$with_aspell_prefix" != "x"; then
++       aspell_prefix=$with_aspell_prefix
+        LDFLAGS="-L$with_aspell_prefix/lib "$LDFLAGS
+        ASPELL_INC="-I$with_aspell_prefix/include"
+        ASPELL_LIBS="-L$with_aspell_prefix/lib -laspell"
diff --git a/textproc/enchant/pkg-descr b/textproc/enchant/pkg-descr
index eb8624759be0..04cf4afb546f 100644
--- a/textproc/enchant/pkg-descr
+++ b/textproc/enchant/pkg-descr
@@ -1,4 +1,16 @@
-Enchant is a dictionary backend. It's somewhat of a broker of various
-pre-existing spellchecking programs.
+On the surface, Enchant appears to be a generic spell checking library. You
+can request dictionaries from it, ask if a word is correctly spelled, get
+corrections for a misspelled word, etc...
+
+Beneath the surface, Enchant is a whole lot more - and less - than that.
+You'll see that Enchant isn't really a spell checking library at all.
+
+"What's that?" you ask. Well, Enchant doesn't try to do any of the work
+itself. It's lazy, and requires backends to do most of its dirty work. Looking
+closer, you'll see the Enchant is more-or-less a fancy wrapper around the
+dlopen() system call. Enchant steps in to provide uniformity and conformity
+on top of these libraries, and implement certain features that may be lacking
+in any individual provider library. Everything should "just work" for any and
+every definition of "just working."
 
 WWW:	http://www.abisource.com/projects/enchant/