diff --git a/VERSION b/VERSION
index 7383bf8f..ac39a106 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.8.0+1
+0.9.0
diff --git a/debian/changelog b/debian/changelog
index f330d6d1..38378cef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+rscds (0.9.0) unstable; urgency=low
+
+  * Changes preparatory to renaming to DAViCal
+  * Security (information leakage) fix from Maxime Delorme
+  * Changes to support newer iCalendar parsing in AWL 0.20
+  * Add support for DAV::principal-property-search report
+  * Refactoring of DAV report handling to improve extensibility
+  * Much improved DAV property handling
+  * Better support for VTODO and reports on VTODO
+
+ -- Andrew McMillan <debian@mcmillan.net.nz>  Tue, 16 Oct 2007 12:04:49 +1300
+
 rscds (0.8.0) unstable; urgency=low
 
   * Check whether a URL missing a trailing '/' might still be a collection.
diff --git a/debian/control b/debian/control
index aa7857b6..db8c63b6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Build-Depends: debhelper
 
 Package: rscds
 Architecture: all
-Depends: debconf (>= 1.0.32), php5 | php4 (>= 4:4.3), php5-pgsql | php4-pgsql(>= 3:4.3.0), postgresql-client-8.2 | postgresql-client-8.1 | postgresql-client-8.0 | postgresql-client (>= 7.4), libawl-php (>=0.14), libclass-dbi-pg-perl, php5 | php4-domxml
-Description: Really Simple CalDAV Store
- The Really Simple CalDAV Store is designed to trivially store
+Depends: debconf (>= 1.0.32), php5 | php4 (>= 4:4.3), php5-pgsql | php4-pgsql(>= 3:4.3.0), postgresql-client-8.2 | postgresql-client-8.1 | postgresql-client-8.0 | postgresql-client (>= 7.4), libawl-php (>=0.20), libclass-dbi-pg-perl, php5 | php4-domxml
+Description: DAViCal Calendar Server
+ The DAViCal Calendar Server is designed to trivially store
  CalDAV calendars, such as those from Evolution, Sunbird/Lightning
  or Mulberry, in a central location, providing shared calendars,
  free/busy publication and basic administration (grouping, delegating,
diff --git a/inc/always.php b/inc/always.php
index 6b84ffe5..9ed926b7 100644
--- a/inc/always.php
+++ b/inc/always.php
@@ -10,11 +10,10 @@
 unset($c);
 
 // Default some of the configurable values
-$c->sysabbr     = 'rscds';
+$c->sysabbr     = 'davical';
 $c->admin_email = 'andrew@catalyst.net.nz';
-$c->system_name = "Really Simple CalDAV Store";
+$c->system_name = "DAViCal CalDAV Server";
 $c->domain_name = $_SERVER['SERVER_NAME'];
-// $c->http_auth_mode = "Basic";
 $c->save_time_zone_defs = true;
 $c->collections_always_exist = true;
 $c->home_calendar_name = 'home';
@@ -55,7 +54,10 @@ $c->protocol_server_port_script = sprintf( "%s://%s%s%s", (isset($_SERVER['HTTPS
 
 init_gettext( 'rscds', '../locale' );
 
-if ( file_exists("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php") ) {
+if ( file_exists("/etc/davical/".$_SERVER['SERVER_NAME']."-conf.php") ) {
+  include_once("/etc/davical/".$_SERVER['SERVER_NAME']."-conf.php");
+}
+else if ( file_exists("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php") ) {
   include_once("/etc/rscds/".$_SERVER['SERVER_NAME']."-conf.php");
 }
 else if ( file_exists("../config/config.php") ) {
@@ -78,16 +80,15 @@ awl_set_locale($c->default_locale);
 *
 */
 $c->code_version = 0;
-$c->version_string = '0.8.0+1'; // The actual version # is replaced into that during the build /release process
+$c->version_string = '0.9.0'; // The actual version # is replaced into that during the build /release process
 if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
   $c->code_major = $matches[1];
-  $c->code_minor = $matches[2];
-  $c->code_patch = $matches[3];
-  $c->code_version = (($c->code_major * 1000) + $c->code_minor).".".intval($c->code_patch);
+  $c->code_minor = $matches[1];
+  $c->code_patch = $matches[1];
+  $c->code_version = (($c->code_major * 1000) + $c->code_minor).".".$c->code_patch;
 }
 dbg_error_log("caldav", "Version %s (%d.%d.%d) == %s", $c->code_pkgver, $c->code_major, $c->code_minor, $c->code_patch, $c->code_version);
-// header( sprintf("Server: %s/%d.%d", $c->code_pkgver, $c->code_major, $c->code_minor) );
-header( sprintf('X-RSCDS-Version: RSCDS/%d.%d.%d; DB/%d.%d.%d', $c->code_major, $c->code_minor, $c->code_patch, $c->schema_major, $c->schema_minor, $c->schema_patch) );
+header( sprintf("Server: %s/%d.%d", $c->code_pkgver, $c->code_major, $c->code_minor) );
 
 /**
 * Force the domain name to what was in the configuration file