diff --git a/addressbook/setup/setup.inc.php b/addressbook/setup/setup.inc.php
index 6b999161ae..99af1fa6af 100755
--- a/addressbook/setup/setup.inc.php
+++ b/addressbook/setup/setup.inc.php
@@ -10,7 +10,7 @@
 /* Basic information about this app */
 $setup_info['addressbook']['name']      = 'addressbook';
 $setup_info['addressbook']['title']     = 'Addressbook';
-$setup_info['addressbook']['version']   = '1.5.001';
+$setup_info['addressbook']['version']   = '1.6';
 $setup_info['addressbook']['app_order'] = 4;
 $setup_info['addressbook']['enable']    = 1;
 
@@ -45,11 +45,11 @@ $setup_info['addressbook']['hooks']['group_acl'] = 'addressbook_hooks::group_acl
 /* Dependencies for this app to work */
 $setup_info['addressbook']['depends'][] = array(
 	'appname' => 'phpgwapi',
-	'versions' => Array('1.3','1.4','1.5')
+	'versions' => Array('1.5','1.6','1.7')
 );
 $setup_info['addressbook']['depends'][] = array(
 	'appname' => 'etemplate',
-	'versions' => Array('1.3','1.4','1.5')
+	'versions' => Array('1.5','1.6','1.7')
 );
 
 // installation checks for addresbook
diff --git a/admin/setup/setup.inc.php b/admin/setup/setup.inc.php
index ae0b89be2e..d3dae4fd28 100755
--- a/admin/setup/setup.inc.php
+++ b/admin/setup/setup.inc.php
@@ -10,7 +10,7 @@
  */
 
 $setup_info['admin']['name']      = 'admin';
-$setup_info['admin']['version']   = '1.5.003';
+$setup_info['admin']['version']   = '1.6';
 $setup_info['admin']['app_order'] = 1;
 $setup_info['admin']['tables']    = array('egw_admin_queue','egw_admin_remote');
 $setup_info['admin']['enable']    = 1;
@@ -49,9 +49,9 @@ $setup_info['admin']['hooks']['sidebox_menu'] =$setup_info['admin']['name'].'.ad
 /* Dependencies for this app to work */
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'phpgwapi',
-	'versions' => Array('1.4','1.5')
+	'versions' => Array('1.5','1.6','1.7')
 );
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'etemplate',
-	'versions' => Array('1.4','1.5')
+	'versions' => Array('1.5','1.6','1.7')
 );
diff --git a/admin/setup/tables_current.inc.php b/admin/setup/tables_current.inc.php
index aea43483e8..c3d1bfbc64 100644
--- a/admin/setup/tables_current.inc.php
+++ b/admin/setup/tables_current.inc.php
@@ -12,44 +12,44 @@
  * @version $Id$
  */
 
-	$phpgw_baseline = array(
-		'egw_admin_queue' => array(
-			'fd' => array(
-				'cmd_id' => array('type' => 'auto'),
-				'cmd_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-				'cmd_creator' => array('type' => 'int','precision' => '4','nullable' => False),
-				'cmd_creator_email' => array('type' => 'varchar','precision' => '128','nullable' => False),
-				'cmd_created' => array('type' => 'int','precision' => '8','nullable' => False),
-				'cmd_type' => array('type' => 'varchar','precision' => '32','nullable' => False,'default' => 'admin_cmd'),
-				'cmd_status' => array('type' => 'int','precision' => '1'),
-				'cmd_scheduled' => array('type' => 'int','precision' => '8'),
-				'cmd_modified' => array('type' => 'int','precision' => '8'),
-				'cmd_modifier' => array('type' => 'int','precision' => '4'),
-				'cmd_modifier_email' => array('type' => 'varchar','precision' => '128'),
-				'cmd_error' => array('type' => 'varchar','precision' => '255'),
-				'cmd_errno' => array('type' => 'int','precision' => '4'),
-				'cmd_requested' => array('type' => 'int','precision' => '4'),
-				'cmd_requested_email' => array('type' => 'varchar','precision' => '128'),
-				'cmd_comment' => array('type' => 'varchar','precision' => '255'),
-				'cmd_data' => array('type' => 'blob'),
-				'remote_id' => array('type' => 'int','precision' => '4')
-			),
-			'pk' => array('cmd_id'),
-			'fk' => array(),
-			'ix' => array('cmd_status','cmd_scheduled'),
-			'uc' => array('cmd_uid')
+$phpgw_baseline = array(
+	'egw_admin_queue' => array(
+		'fd' => array(
+			'cmd_id' => array('type' => 'auto'),
+			'cmd_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
+			'cmd_creator' => array('type' => 'int','precision' => '4','nullable' => False),
+			'cmd_creator_email' => array('type' => 'varchar','precision' => '128','nullable' => False),
+			'cmd_created' => array('type' => 'int','precision' => '8','nullable' => False),
+			'cmd_type' => array('type' => 'varchar','precision' => '32','nullable' => False,'default' => 'admin_cmd'),
+			'cmd_status' => array('type' => 'int','precision' => '1'),
+			'cmd_scheduled' => array('type' => 'int','precision' => '8'),
+			'cmd_modified' => array('type' => 'int','precision' => '8'),
+			'cmd_modifier' => array('type' => 'int','precision' => '4'),
+			'cmd_modifier_email' => array('type' => 'varchar','precision' => '128'),
+			'cmd_error' => array('type' => 'varchar','precision' => '255'),
+			'cmd_errno' => array('type' => 'int','precision' => '4'),
+			'cmd_requested' => array('type' => 'int','precision' => '4'),
+			'cmd_requested_email' => array('type' => 'varchar','precision' => '128'),
+			'cmd_comment' => array('type' => 'varchar','precision' => '255'),
+			'cmd_data' => array('type' => 'blob'),
+			'remote_id' => array('type' => 'int','precision' => '4')
 		),
-		'egw_admin_remote' => array(
-			'fd' => array(
-				'remote_id' => array('type' => 'auto'),
-				'remote_name' => array('type' => 'varchar','precision' => '64','nullable' => False),
-				'remote_hash' => array('type' => 'varchar','precision' => '32','nullable' => False),
-				'remote_url' => array('type' => 'varchar','precision' => '128','nullable' => False),
-				'remote_domain' => array('type' => 'varchar','precision' => '64','nullable' => False)
-			),
-			'pk' => array('remote_id'),
-			'fk' => array(),
-			'ix' => array(),
-			'uc' => array('remote_name')
-		)
-	);
+		'pk' => array('cmd_id'),
+		'fk' => array(),
+		'ix' => array('cmd_status','cmd_scheduled'),
+		'uc' => array('cmd_uid')
+	),
+	'egw_admin_remote' => array(
+		'fd' => array(
+			'remote_id' => array('type' => 'auto'),
+			'remote_name' => array('type' => 'varchar','precision' => '64','nullable' => False),
+			'remote_hash' => array('type' => 'varchar','precision' => '32','nullable' => False),
+			'remote_url' => array('type' => 'varchar','precision' => '128','nullable' => False),
+			'remote_domain' => array('type' => 'varchar','precision' => '64','nullable' => False)
+		),
+		'pk' => array('remote_id'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => array('remote_name')
+	)
+);
diff --git a/admin/setup/tables_update.inc.php b/admin/setup/tables_update.inc.php
index 29a2dcd408..9af4906adc 100644
--- a/admin/setup/tables_update.inc.php
+++ b/admin/setup/tables_update.inc.php
@@ -14,10 +14,10 @@
 
 function admin_upgrade1_2()
 {
-	return $GLOBALS['setup_info']['admin']['currentver'] = '1.4';		
+	return $GLOBALS['setup_info']['admin']['currentver'] = '1.4';
 }
 
-$test[] = '1.4';
+
 function admin_upgrade1_4()
 {
 	$GLOBALS['egw_setup']->oProc->CreateTable('egw_admin_queue',array(
@@ -45,38 +45,42 @@ function admin_upgrade1_4()
 		'ix' => array('cmd_status','cmd_scheduled'),
 		'uc' => array('cmd_uid')
 	));
-	return $GLOBALS['setup_info']['admin']['currentver'] = '1.5.001';		
+	return $GLOBALS['setup_info']['admin']['currentver'] = '1.5.001';
 }
 
-	$test[] = '1.5.001';
-	function admin_upgrade1_5_001()
-	{
-		$GLOBALS['egw_setup']->oProc->CreateTable('egw_admin_remote',array(
-			'fd' => array(
-				'remote_id' => array('type' => 'auto'),
-				'remote_name' => array('type' => 'varchar','precision' => '64','nullable' => False),
-				'remote_hash' => array('type' => 'varchar','precision' => '32','nullable' => False),
-				'remote_url' => array('type' => 'varchar','precision' => '128','nullable' => False),
-				'remote_domain' => array('type' => 'varchar','precision' => '64','nullable' => False)
-			),
-			'pk' => array('remote_id'),
-			'fk' => array(),
-			'ix' => array(),
-			'uc' => array('remote_name')
-		));
 
-		return $GLOBALS['setup_info']['admin']['currentver'] = '1.5.002';
-	}
+function admin_upgrade1_5_001()
+{
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_admin_remote',array(
+		'fd' => array(
+			'remote_id' => array('type' => 'auto'),
+			'remote_name' => array('type' => 'varchar','precision' => '64','nullable' => False),
+			'remote_hash' => array('type' => 'varchar','precision' => '32','nullable' => False),
+			'remote_url' => array('type' => 'varchar','precision' => '128','nullable' => False),
+			'remote_domain' => array('type' => 'varchar','precision' => '64','nullable' => False)
+		),
+		'pk' => array('remote_id'),
+		'fk' => array(),
+		'ix' => array(),
+		'uc' => array('remote_name')
+	));
+
+	return $GLOBALS['setup_info']['admin']['currentver'] = '1.5.002';
+}
 
 
-	$test[] = '1.5.002';
-	function admin_upgrade1_5_002()
-	{
-		$GLOBALS['egw_setup']->oProc->AddColumn('egw_admin_queue','remote_id',array(
-			'type' => 'int',
-			'precision' => '4'
-		));
+function admin_upgrade1_5_002()
+{
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_admin_queue','remote_id',array(
+		'type' => 'int',
+		'precision' => '4'
+	));
 
-		return $GLOBALS['setup_info']['admin']['currentver'] = '1.5.003';
-	}
-?>
+	return $GLOBALS['setup_info']['admin']['currentver'] = '1.5.003';
+}
+
+
+function admin_upgrade1_5_003()
+{
+	return $GLOBALS['setup_info']['admin']['currentver'] = '1.6';
+}