diff --git a/htdocs/always.php b/htdocs/always.php
index 676fb513..db5f1cea 100644
--- a/htdocs/always.php
+++ b/htdocs/always.php
@@ -116,6 +116,7 @@ $c->protocol_server_port_script = $c->protocol_server_port . ($_SERVER['SCRIPT_N
 * access which could break DAViCal completely by causing output to start
 * too early.
 */
+ob_start( );
 if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
   include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
 }
@@ -138,6 +139,8 @@ else {
   include('davical_configuration_missing.php');
   exit;
 }
+$config_warnings = trim(ob_get_contents());
+ob_end_clean();
 
 if ( !isset($c->page_title) ) $c->page_title = $c->system_name;
 
@@ -180,7 +183,7 @@ $_SERVER['SERVER_NAME'] = $c->domain_name;
 
 require_once('AwlQuery.php');
 
-$c->want_dbversion = array(1,2,8);
+$c->want_dbversion = array(1,2,9);
 $c->schema_version = 0;
 $qry = new AwlQuery( 'SELECT schema_major, schema_minor, schema_patch FROM awl_db_revision ORDER BY schema_id DESC LIMIT 1;' );
 if ( $qry->Exec('always',__LINE__,__FILE__) && $row = $qry->Fetch() ) {
diff --git a/htdocs/setup.php b/htdocs/setup.php
index 2cb87b07..205946f1 100644
--- a/htdocs/setup.php
+++ b/htdocs/setup.php
@@ -139,6 +139,14 @@ $site_statistics_table = build_site_statistics();
 
 $heading_config_clients = translate('Configuring Calendar Clients for DAViCal');
 $heading_config_davical = translate('Configuring DAViCal');
+$davical_configuration_errors = '';
+if ( $config_warnings != '' ) {
+  $davical_configuration_errors = '<div class="error"><h3 class="error">' . translate('Your configuration produced PHP errors which should be corrected') . '</h3>
+<pre>
+'.$config_warnings.'
+</pre></div>
+';
+}
 
   echo <<<EOBODY
 <style>
@@ -217,6 +225,7 @@ to configure Evolution, Sunbird, Lightning and Mulberry to use remotely hosted c
 
 <h2>$heading_config_davical</h2>
 <p>If you can read this then things must be mostly working already.</p>
+$davical_configuration_errors
 <p>The <a href="http://www.davical.org/installation.php">installation page on the DAViCal website</a> has
 some further information on how to install and configure this application.</p>
 EOBODY;
diff --git a/inc/always.php.in b/inc/always.php.in
index e3724057..aa6ecd70 100644
--- a/inc/always.php.in
+++ b/inc/always.php.in
@@ -116,6 +116,7 @@ $c->protocol_server_port_script = $c->protocol_server_port . ($_SERVER['SCRIPT_N
 * access which could break DAViCal completely by causing output to start
 * too early.
 */
+ob_start( );
 if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
   include('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
 }
@@ -138,6 +139,8 @@ else {
   include('davical_configuration_missing.php');
   exit;
 }
+$config_warnings = trim(ob_get_contents());
+ob_end_clean();
 
 if ( !isset($c->page_title) ) $c->page_title = $c->system_name;