diff --git a/www/mod_auth_ldap/Makefile b/www/mod_auth_ldap/Makefile
index 17fcb985f37..fc7f663404a 100644
--- a/www/mod_auth_ldap/Makefile
+++ b/www/mod_auth_ldap/Makefile
@@ -1,21 +1,17 @@
-# $OpenBSD: Makefile,v 1.7 2007/02/11 10:31:20 bernd Exp $
-
-# This port currently only works with archs supporting dynamic loading
-# and has Apache that supports DSO's.
-NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
+# $OpenBSD: Makefile,v 1.8 2007/06/21 20:25:40 simon Exp $
 
 COMMENT=	"Apache LDAP authentication module"
 
 VERSION=	1.6.0
 DISTNAME=	auth_ldap-${VERSION}
-PKGNAME=	mod_auth_ldap-${VERSION}p3
+PKGNAME=	mod_auth_ldap-${VERSION}p4
 CATEGORIES=	www
 
 HOMEPAGE=	http://www.rudedog.org/auth_ldap/
 
 MASTER_SITES=	${HOMEPAGE}
 
-MAINTAINER=	Henning Brauer <henning@openbsd.org>
+MODULES+=	apache-module
 
 # Apache License, one unused function GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -23,6 +19,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MODAPACHE_NAME=		auth_ldap
+MODAPACHE_FILE=		${MODAPACHE_LOCATION}/auth_ldap.so
+
 LIB_DEPENDS=	ldap,lber::databases/openldap
 
 NO_REGRESS=	Yes
@@ -30,15 +29,12 @@ NO_REGRESS=	Yes
 CONFIGURE_STYLE=gnu
 
 post-build:
-	sed 's,!!PREFIX!!,${PREFIX},' \
-		< ${FILESDIR}/mod_auth_ldap-enable \
-		> ${WRKBUILD}/mod_auth_ldap-enable
+	@${MODAPACHE_CREATE_ENABLE_SCRIPT}
 
 do-install:
-	${INSTALL_DATA} ${WRKBUILD}/auth_ldap.so ${PREFIX}/lib
-	${INSTALL_SCRIPT} ${WRKBUILD}/mod_auth_ldap-enable ${PREFIX}/sbin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_auth_ldap
 	${INSTALL_DATA} ${WRKBUILD}/auth_ldap.html \
 		${PREFIX}/share/doc/mod_auth_ldap
+	${MODAPACHE_INSTALL}
 
 .include <bsd.port.mk>
diff --git a/www/mod_auth_ldap/files/mod_auth_ldap-enable b/www/mod_auth_ldap/files/mod_auth_ldap-enable
deleted file mode 100644
index deebc3831ac..00000000000
--- a/www/mod_auth_ldap/files/mod_auth_ldap-enable
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: mod_auth_ldap-enable,v 1.1.1.1 2003/05/04 23:09:01 henning Exp $
-
-MODULE=!!PREFIX!!/lib/auth_ldap.so
-
-if [ `id -u` -ne 0 ]; then
-    echo "You must be root to run this script."
-    exit
-fi
-
-if [ ! -f ${MODULE} ]; then
-    echo "Cannot find auth_ldap module (${MODULE})"
-    exit 1
-else
-    echo "Enabling LDAP Authentication module..."
-    /usr/sbin/apxs -i -a -n auth_ldap ${MODULE}
-fi
diff --git a/www/mod_auth_ldap/pkg/MESSAGE b/www/mod_auth_ldap/pkg/MESSAGE
index ff28e52095f..7a6cea98bcd 100644
--- a/www/mod_auth_ldap/pkg/MESSAGE
+++ b/www/mod_auth_ldap/pkg/MESSAGE
@@ -1,7 +1,7 @@
 To finish the install of mod_auth_ldap, you need
 to enable the module using the following command
 
-  ${PREFIX}/sbin/mod_auth_ldap-enable
+  ${PREFIX}/sbin/${MODAPACHE_ENABLE}
 
 If you already have Apache running on your machine,
 you should not use "apachectl restart" - instead,
diff --git a/www/mod_auth_ldap/pkg/PLIST b/www/mod_auth_ldap/pkg/PLIST
index 28f5f6709bc..6e279df1e81 100644
--- a/www/mod_auth_ldap/pkg/PLIST
+++ b/www/mod_auth_ldap/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2005/02/13 11:04:24 mbalmer Exp $
-lib/auth_ldap.so
-sbin/mod_auth_ldap-enable
+@comment $OpenBSD: PLIST,v 1.4 2007/06/21 20:25:40 simon Exp $
+lib/${MODAPACHE_MODULE}
+@exec-update test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL}
+sbin/${MODAPACHE_ENABLE}
 share/doc/mod_auth_ldap/
 share/doc/mod_auth_ldap/auth_ldap.html
-@unexec rm -f /usr/lib/apache/modules/auth_ldap.so
+@unexec-delete rm -f ${MODAPACHE_FINAL}