diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 30f9d5d2ac3..764d231f6dc 100755
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2008/11/29 09:29:11 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2009/01/12 13:04:09 ajacoutot Exp $
 
 COMMENT=	generic spell checking library/wrapper
 
 V=		1.4.2
 DISTNAME=	enchant-${V}
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 SHARED_LIBS=	enchant	5.1 # .5.2
 CATEGORIES=	textproc
 
@@ -20,11 +20,14 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://www.abisource.com/downloads/enchant/${V}/
 
-WANTLIB=	c m glib-2.0 gmodule-2.0 pcre stdc++
+WANTLIB=	c m pcre stdc++
 
 LIB_DEPENDS=	aspell.>=16::textproc/aspell/core \
 		glib-2.0,gmodule-2.0::devel/glib2
 
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	::x11/dbus-glib
+
 MODULES=	devel/gettext
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE=gnu
diff --git a/textproc/enchant/patches/patch-configure b/textproc/enchant/patches/patch-configure
index 1f435ffe410..a0b4767e1bc 100644
--- a/textproc/enchant/patches/patch-configure
+++ b/textproc/enchant/patches/patch-configure
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.4 2008/11/24 18:43:35 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.5 2009/01/12 13:04:09 ajacoutot Exp $
 --- configure.orig	Mon May  5 22:27:23 2008
 +++ configure	Mon Nov 24 12:03:08 2008
 @@ -22660,7 +22660,7 @@ if test $ac_cv_lib_aspell_get_aspell_dict_info_list = 
@@ -6,7 +6,7 @@ $OpenBSD: patch-configure,v 1.4 2008/11/24 18:43:35 ajacoutot Exp $
  
  
 -       ASPELL_CFLAGS+=" -DHAVE_PSPELL_H"
-+       ASPELL_CFLAGS=" -DHAVE_PSPELL_H"
++       ASPELL_CFLAGS="${ASPELL_CFLAGS} -DHAVE_PSPELL_H"
     elif test -f "$aspell_prefix/include/aspell.h"; then
         { echo "$as_me:$LINENO: result: yes (aspell)" >&5
  echo "${ECHO_T}yes (aspell)" >&6; }
diff --git a/textproc/enchant/pkg/PLIST b/textproc/enchant/pkg/PLIST
index 67d697885f4..38c2f035847 100644
--- a/textproc/enchant/pkg/PLIST
+++ b/textproc/enchant/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2008/11/29 09:29:11 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.5 2009/01/12 13:04:09 ajacoutot Exp $
 %%SHARED%%
 @bin bin/enchant
 @bin bin/enchant-lsmod
@@ -13,7 +13,6 @@ lib/enchant/libenchant_ispell.a
 lib/enchant/libenchant_ispell.la
 lib/libenchant.a
 lib/libenchant.la
-lib/pkgconfig/
 lib/pkgconfig/enchant.pc
 @man man/man1/enchant.1
 share/enchant/