diff --git a/www/phpldapadmin/Makefile b/www/phpldapadmin/Makefile
index 9e9db2a4447..2a33c07ab16 100644
--- a/www/phpldapadmin/Makefile
+++ b/www/phpldapadmin/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.2 2005/04/04 19:19:57 mbalmer Exp $ 
+# $OpenBSD: Makefile,v 1.3 2005/09/08 06:24:26 mbalmer Exp $ 
 
 COMMENT=	"web-based LDAP browser to manage LDAP servers"
 
-VERSION=	0.9.6
+VERSION=	0.9.7-rc1
 DISTNAME=	phpldapadmin-${VERSION}
 CATEGORIES=	www
 HOMEPAGE=	http://phpldapadmin.sourceforge.net/	
 
-MAINTAINER=	AJ Nelson <dru@dummydata.com>
+MAINTAINER=	Marc Balmer <mbalmer@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/www/phpldapadmin/distinfo b/www/phpldapadmin/distinfo
index 234c409c2d0..2b940d187be 100644
--- a/www/phpldapadmin/distinfo
+++ b/www/phpldapadmin/distinfo
@@ -1,4 +1,4 @@
-MD5 (phpldapadmin-0.9.6.tar.gz) = db5eb502697712ebdaeb34766b6a7760
-RMD160 (phpldapadmin-0.9.6.tar.gz) = 7c98e5f7df5dfd59aae556590655001dbf1890f5
-SHA1 (phpldapadmin-0.9.6.tar.gz) = 4083cf351003c04d118e152e21a4725209f45a33
-SIZE (phpldapadmin-0.9.6.tar.gz) = 706823
+MD5 (phpldapadmin-0.9.7-rc1.tar.gz) = 552b37cf2adef367ba6fc1dab43f18d6
+RMD160 (phpldapadmin-0.9.7-rc1.tar.gz) = 9a79d25833e2269d7e73aa94258f0a626b6de21b
+SHA1 (phpldapadmin-0.9.7-rc1.tar.gz) = ee34245ab940c66423ae3987c3341829ba2fe9c7
+SIZE (phpldapadmin-0.9.7-rc1.tar.gz) = 738572
diff --git a/www/phpldapadmin/pkg/PLIST b/www/phpldapadmin/pkg/PLIST
index e1a8dd715cc..0dc0a6ba0c7 100644
--- a/www/phpldapadmin/pkg/PLIST
+++ b/www/phpldapadmin/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2005/04/04 19:19:57 mbalmer Exp $
+@comment $OpenBSD: PLIST,v 1.3 2005/09/08 06:24:26 mbalmer Exp $
 phpldapadmin-${VERSION}/
 @comment phpldapadmin-${VERSION}/.cvsignore
 phpldapadmin-${VERSION}/INSTALL
@@ -18,6 +18,7 @@ phpldapadmin-${VERSION}/compare.php
 phpldapadmin-${VERSION}/compare_form.php
 phpldapadmin-${VERSION}/config.php.example
 @sample phpldapadmin-${VERSION}/config.php
+phpldapadmin-${VERSION}/config_default.php
 phpldapadmin-${VERSION}/copy.php
 phpldapadmin-${VERSION}/copy_form.php
 phpldapadmin-${VERSION}/create.php
@@ -233,6 +234,7 @@ phpldapadmin-${VERSION}/images/dc.png
 phpldapadmin-${VERSION}/images/device.png
 phpldapadmin-${VERSION}/images/document.png
 phpldapadmin-${VERSION}/images/door.png
+phpldapadmin-${VERSION}/images/error.png
 phpldapadmin-${VERSION}/images/files.png
 phpldapadmin-${VERSION}/images/find.png
 phpldapadmin-${VERSION}/images/folder.png
@@ -248,6 +250,7 @@ phpldapadmin-${VERSION}/images/light.png
 phpldapadmin-${VERSION}/images/locality.png
 phpldapadmin-${VERSION}/images/lock.png
 phpldapadmin-${VERSION}/images/logo.jpg
+phpldapadmin-${VERSION}/images/logo_small.jpg
 phpldapadmin-${VERSION}/images/mail.png
 phpldapadmin-${VERSION}/images/mail_account.png
 phpldapadmin-${VERSION}/images/mail_alias.png
@@ -267,6 +270,7 @@ phpldapadmin-${VERSION}/images/plus.png
 phpldapadmin-${VERSION}/images/process.png
 phpldapadmin-${VERSION}/images/refresh.png
 phpldapadmin-${VERSION}/images/rename.png
+phpldapadmin-${VERSION}/images/rfc.png
 phpldapadmin-${VERSION}/images/save.png
 phpldapadmin-${VERSION}/images/server-settings.png
 phpldapadmin-${VERSION}/images/server-small.png
@@ -356,7 +360,12 @@ phpldapadmin-${VERSION}/server_info.php
 phpldapadmin-${VERSION}/session_functions.php
 phpldapadmin-${VERSION}/style.css
 phpldapadmin-${VERSION}/syslog.php
+phpldapadmin-${VERSION}/template_engine.php
+phpldapadmin-${VERSION}/template_functions.php
 phpldapadmin-${VERSION}/templates/
+phpldapadmin-${VERSION}/templates/alias.xml
+phpldapadmin-${VERSION}/templates/courierMailAccount.xml
+phpldapadmin-${VERSION}/templates/courierMailAlias.xml
 phpldapadmin-${VERSION}/templates/creation/
 phpldapadmin-${VERSION}/templates/creation/custom.php
 phpldapadmin-${VERSION}/templates/creation/new_address_template.php
@@ -382,12 +391,29 @@ phpldapadmin-${VERSION}/templates/creation/new_smb3_user_template.php
 phpldapadmin-${VERSION}/templates/creation/new_smbgroup_template.php
 phpldapadmin-${VERSION}/templates/creation/new_smbuser_template.php
 phpldapadmin-${VERSION}/templates/creation/new_user_template.php
+phpldapadmin-${VERSION}/templates/dNSDomain.xml
+phpldapadmin-${VERSION}/templates/example.xml
+phpldapadmin-${VERSION}/templates/inetOrgPerson.xml
+phpldapadmin-${VERSION}/templates/kolabPerson.xml
 phpldapadmin-${VERSION}/templates/modification/
 phpldapadmin-${VERSION}/templates/modification/default.php
 phpldapadmin-${VERSION}/templates/modification/group_of_names.php
 phpldapadmin-${VERSION}/templates/modification/samba_account.php
 phpldapadmin-${VERSION}/templates/modification/user.php
+phpldapadmin-${VERSION}/templates/mozillaOrgPerson.xml
+phpldapadmin-${VERSION}/templates/organizationalRole.xml
+phpldapadmin-${VERSION}/templates/ou.xml
+phpldapadmin-${VERSION}/templates/posixAccount.xml
+phpldapadmin-${VERSION}/templates/posixGroup.xml
+phpldapadmin-${VERSION}/templates/sendmailMTAAliasObject.xml
+phpldapadmin-${VERSION}/templates/sendmailMTAClass.xml
+phpldapadmin-${VERSION}/templates/sendmailMTACluster.xml
+phpldapadmin-${VERSION}/templates/sendmailMTAMapObject.xml
+phpldapadmin-${VERSION}/templates/sendmailVirtualDomain.xml
+phpldapadmin-${VERSION}/templates/sendmailVirtualUser.xml
+phpldapadmin-${VERSION}/templates/simpleSecurityObject.xml
 phpldapadmin-${VERSION}/templates/template_config.php
+phpldapadmin-${VERSION}/templates/template_header.php
 phpldapadmin-${VERSION}/timeout.php
 phpldapadmin-${VERSION}/timeout_functions.php
 phpldapadmin-${VERSION}/tree.php