diff --git a/www/apache-httpd/Makefile b/www/apache-httpd/Makefile
index 8aefa336d55..7165f439dd4 100644
--- a/www/apache-httpd/Makefile
+++ b/www/apache-httpd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2009/04/09 18:36:00 bernd Exp $
+# $OpenBSD: Makefile,v 1.20 2009/05/15 15:46:58 claudio Exp $
 
 COMMENT=	apache HTTP server
 
 V=		2.2.11
-PKGNAME=	apache-httpd-${V}
+PKGNAME=	apache-httpd-${V}p0
 DISTNAME=	httpd-${V}
 
 CATEGORIES=	www net
@@ -60,7 +60,11 @@ CONFIGURE_ARGS+=	--enable-layout=OpenBSD \
 			--enable-disk-cache \
 			--enable-proxy \
 			--enable-mods-shared=all \
-			--with-pcre=${LOCALBASE}
+			--enable-suexec \
+			--with-suexec-caller=_apache2 \
+			--with-suexec-bin=${TRUEPREFIX}/sbin/suexec2 \
+			--with-suexec-logfile=/var/log/suexec2_log \
+			--with-pcre=${LOCALBASE} 
 
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
@@ -71,7 +75,7 @@ FAKE_FLAGS+=		rel_user=_apache2 rel_group=_apache2 \
 			sysconfdir=${PREFIX}/share/examples/apache2/conf
 
 A2SBIN=			apachectl apxs dbmmanage htdigest htpasswd \
-			logresolve rotatelogs
+			logresolve rotatelogs suexec
 A2MAN1=			dbmmanage htdigest htpasswd
 A2MAN8= 		apachectl apxs httpd logresolve rotatelogs suexec
 
diff --git a/www/apache-httpd/pkg/PLIST b/www/apache-httpd/pkg/PLIST
index 9562390306a..ff0761f2f1e 100644
--- a/www/apache-httpd/pkg/PLIST
+++ b/www/apache-httpd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.14 2009/04/09 18:36:00 bernd Exp $
+@comment $OpenBSD: PLIST,v 1.15 2009/05/15 15:46:58 claudio Exp $
 @newgroup _apache2:576
 @newuser _apache2:576:576:daemon:Apache HTTP Server:/var/empty:/sbin/nologin
 include/apache2/
@@ -104,6 +104,7 @@ lib/apache2/mod_speling.so
 lib/apache2/mod_ssl.so
 lib/apache2/mod_status.so
 lib/apache2/mod_substitute.so
+lib/apache2/mod_suexec.so
 lib/apache2/mod_unique_id.so
 lib/apache2/mod_userdir.so
 lib/apache2/mod_usertrack.so
@@ -136,6 +137,7 @@ sbin/envvars-std
 @bin sbin/httxt2dbm
 @bin sbin/logresolve2
 @bin sbin/rotatelogs2
+@bin sbin/suexec2
 share/apache2/
 share/apache2/build/
 share/apache2/build/config.nice