diff --git a/header.inc.php.template b/header.inc.php.template
index 7f3567c642..8596c3cdfc 100644
--- a/header.inc.php.template
+++ b/header.inc.php.template
@@ -81,9 +81,10 @@
 	\**************************************************************************/
 	define('PHPGW_API_INC',PHPGW_INCLUDE_ROOT.'/phpgwapi/inc');
 	include(PHPGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php');
+	$phpgw_info["server"]["versions"]["phpgwapi"] = $setup_info['phpgwapi']['version'];
 	$phpgw_info['server']['versions']['current_header'] = $setup_info['phpgwapi']['versions']['current_header'];
 	unset($setup_info);
-	$phpgw_info['server']['versions']['header'] = '1.13';
+	$phpgw_info['server']['versions']['header'] = '1.14';
 	// This is a fix for NT
 	if (!isset($phpgw_info['flags']['noapi']) || !$phpgw_info['flags']['noapi'] == True)
 	{
diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php
index 42c098892a..d05e604245 100755
--- a/phpgwapi/setup/setup.inc.php
+++ b/phpgwapi/setup/setup.inc.php
@@ -3,7 +3,7 @@
 	$setup_info['phpgwapi']['name']    = 'phpgwapi';
 	$setup_info['phpgwapi']['title']   = 'phpgwapi';
 	$setup_info['phpgwapi']['version'] = '0.9.13.001';
-	$setup_info['phpgwapi']['versions']['current_header'] = '1.13';
+	$setup_info['phpgwapi']['versions']['current_header'] = '1.14';
 //	$setup_info['phpgwapi']['app_order'] = '6';
 
 	/* The tables this app creates */
diff --git a/setup/inc/functions.inc.php b/setup/inc/functions.inc.php
index 68f4d2ec60..8dcd38b632 100644
--- a/setup/inc/functions.inc.php
+++ b/setup/inc/functions.inc.php
@@ -87,15 +87,16 @@
   // password in ../header.inc.php to protect all of the setup
   // pages from unauthorized use.
 
-  if(file_exists('../version.inc.php')) {
-    include('../version.inc.php');  // To set the current core version
-  }else{
-    $phpgw_info['server']['versions']['phpgwapi'] = 'Undetected';
-  }
+	$phpgw_info['server']['app_images'] = 'templates/default/images';
 
-  $phpgw_info['server']['app_images'] = 'templates/default/images';
-
-  if(file_exists('../header.inc.php')) { include('../header.inc.php'); }
+	if(file_exists('../header.inc.php'))
+	{
+		include('../header.inc.php');
+	}
+	else
+	{
+		$phpgw_info['server']['versions']['phpgwapi'] = 'Undetected';
+	}
 
   include('./inc/phpgw_setup.inc.php');
   include('./inc/phpgw_schema_proc.inc.php');