diff --git a/devel/apr-util/Makefile b/devel/apr-util/Makefile
index 5ba4c4ff210..65e5ca04ff2 100644
--- a/devel/apr-util/Makefile
+++ b/devel/apr-util/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2006/09/30 19:08:22 alek Exp $
+# $OpenBSD: Makefile,v 1.7 2006/10/04 09:30:00 alek Exp $
 
 COMMENT=	"companion library to APR"
 
-DISTNAME=	apr-util-1.0.1
-PKGNAME=	${DISTNAME}p4
-SHARED_LIBS=	aprutil-1 0.1
+DISTNAME=	apr-util-1.2.7
+SHARED_LIBS=	aprutil-1 2.7
 
 CATEGORIES=	devel
 
@@ -21,10 +20,9 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	http://www.apache.org/dist/apr/ \
 		http://www.eu.apache.org/dist/apr/
 
-RUN_DEPENDS=	lib/db4/db.=4:db-4.*:databases/db/v4 \
-		expat.4:expat->=1.95.6:textproc/expat \
-		apr-1.0:apr-1.0.1:devel/apr
-BUILD_DEPENDS=	${RUN_DEPENDS}
+LIB_DEPENDS=	lib/db4/db.=4:db-4.*:databases/db/v4 \
+		expat.>=4:expat->=1.95.6:textproc/expat \
+		apr-1.=2:apr-1.2.7:devel/apr
 
 MODULES=	converters/libiconv		
 USE_LIBTOOL=	Yes
diff --git a/devel/apr-util/distinfo b/devel/apr-util/distinfo
index b8b9fc9c1e3..55b0c7db79c 100644
--- a/devel/apr-util/distinfo
+++ b/devel/apr-util/distinfo
@@ -1,4 +1,4 @@
-MD5 (apr-util-1.0.1.tar.gz) = 36300ad71a6e7d15624ae83d51833b37
-RMD160 (apr-util-1.0.1.tar.gz) = 618fb46c758a42d61eef2f0d7a332d16339348d1
-SHA1 (apr-util-1.0.1.tar.gz) = 6357c3dc16c4ff8548251ac542ca47d581fc0deb
-SIZE (apr-util-1.0.1.tar.gz) = 597911
+MD5 (apr-util-1.2.7.tar.gz) = c3702668a640be1695956115857ec22e
+RMD160 (apr-util-1.2.7.tar.gz) = 339983cbbf4ee66139f14dbb3437d596e5790b2f
+SHA1 (apr-util-1.2.7.tar.gz) = fdba7b46fe5732dfdab5a90005244080a449f985
+SIZE (apr-util-1.2.7.tar.gz) = 641600
diff --git a/devel/apr-util/pkg/PLIST b/devel/apr-util/pkg/PLIST
index 61b1e8b1f1f..22c70bc5599 100644
--- a/devel/apr-util/pkg/PLIST
+++ b/devel/apr-util/pkg/PLIST
@@ -1,15 +1,16 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2004/11/28 14:42:08 alek Exp $
+@comment $OpenBSD: PLIST,v 1.2 2006/10/04 09:30:01 alek Exp $
 %%SHARED%%
 bin/apu-1-config
-include/apr-1/
 include/apr-1/apr_anylock.h
 include/apr-1/apr_base64.h
 include/apr-1/apr_buckets.h
 include/apr-1/apr_date.h
+include/apr-1/apr_dbd.h
 include/apr-1/apr_dbm.h
 include/apr-1/apr_hooks.h
 include/apr-1/apr_ldap.h
 include/apr-1/apr_ldap_init.h
+include/apr-1/apr_ldap_option.h
 include/apr-1/apr_ldap_url.h
 include/apr-1/apr_md4.h
 include/apr-1/apr_md5.h
@@ -31,5 +32,4 @@ include/apr-1/apu_want.h
 @comment lib/aprutil.exp
 lib/libaprutil-1.a
 lib/libaprutil-1.la
-lib/pkgconfig/
 lib/pkgconfig/apr-util-1.pc
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 1504ec5e9ba..31d6e5e43c0 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2006/01/06 13:14:28 bernd Exp $
+# $OpenBSD: Makefile,v 1.5 2006/10/04 09:30:00 alek Exp $
 
 COMMENT=	"Apache Portable Runtime"
 
-DISTNAME=	apr-1.0.1
-PKGNAME=	apr-1.0.1p2
-SHARED_LIBS=	apr-1 0.1
+DISTNAME=	apr-1.2.7
+SHARED_LIBS=	apr-1 2.7
 
 CATEGORIES=	devel
 
diff --git a/devel/apr/distinfo b/devel/apr/distinfo
index c95be9a5dfb..b0bd3204c5c 100644
--- a/devel/apr/distinfo
+++ b/devel/apr/distinfo
@@ -1,4 +1,4 @@
-MD5 (apr-1.0.1.tar.gz) = 0a3cb911ea1823cfa3e5863892774705
-RMD160 (apr-1.0.1.tar.gz) = c3a99cfb5910fad094a82ce06cb68b034e68783c
-SHA1 (apr-1.0.1.tar.gz) = 42368fe687d68fa5ac10b67f89550b385c8b8d54
-SIZE (apr-1.0.1.tar.gz) = 1058637
+MD5 (apr-1.2.7.tar.gz) = aea926cbe588f844ad9e317157d60175
+RMD160 (apr-1.2.7.tar.gz) = 9dfeb562b376c32261b8a263887a05515c4afbe2
+SHA1 (apr-1.2.7.tar.gz) = 437ad4066f71a197029ff86a8cb55f3b6817a1f3
+SIZE (apr-1.2.7.tar.gz) = 1102370