diff --git a/sysutils/modlogan/Makefile b/sysutils/modlogan/Makefile
index 59b06e1ac5f..2729de7b2f2 100644
--- a/sysutils/modlogan/Makefile
+++ b/sysutils/modlogan/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2007/04/06 06:33:22 steven Exp $
+# $OpenBSD: Makefile,v 1.17 2007/05/02 13:00:53 bernd Exp $
 
 COMMENT=	"modular log analyzer"
 
 DISTNAME=	modlogan-0.8.13
-PKGNAME=	${DISTNAME}p3
+PKGNAME=	${DISTNAME}p4
 CATEGORIES=	sysutils www
 
 HOMEPAGE=	http://jan.kneschke.de/projects/modlogan/
@@ -17,12 +17,11 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c jpeg m png z 
+WANTLIB=		c expat fontconfig freetype jpeg m png z 
 
 MODULES=	devel/gettext
 
-LIB_DEPENDS=	expat.>=3::textproc/expat \
-		gd.>=18::graphics/gd \
+LIB_DEPENDS=	gd.>=18::graphics/gd \
 		pcre::devel/pcre \
 		adns.>=1::net/adns \
 		bz2.>=10::archivers/bzip2
@@ -31,6 +30,7 @@ USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/modlogan
 CONFIGURE_ENV += LOCALBASE="${LOCALBASE}" \
+		 CPPFLAGS="-I${X11BASE}/include" \
 		 LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 MAKE_FLAGS=	INTLLIBS="-L${LOCALBASE}/lib -lintl -liconv"