diff --git a/addressbook/setup/details.inc.php b/addressbook/setup/details.inc.php
deleted file mode 100644
index 71c8875a01..0000000000
--- a/addressbook/setup/details.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-	include('../version.inc.php');
-	$phpgw_info['setup']['addressbook']['name'] = 'Addressbook';
-	$phpgw_info['setup']['addressbook']['version'] = $phpgw_info['server']['versions']['addressbook'];
-	$phpgw_info['setup']['addressbook']['app_order'] = 7;
-	$phpgw_info['setup']['addressbook']['tables'] = "";
-	$hooks = Array();
-	$hooks_string = implode (',', $hooks);
-	$phpgw_info['setup']['addressbook']['hooks'] = $hooks_string;
-?>
\ No newline at end of file
diff --git a/addressbook/setup/setup.inc.php b/addressbook/setup/setup.inc.php
new file mode 100755
index 0000000000..ff7b33b3d3
--- /dev/null
+++ b/addressbook/setup/setup.inc.php
@@ -0,0 +1,9 @@
+<?php
+	$setup_info['addressbook']['name'] = 'Addressbook';
+	$setup_info['addressbook']['version'] = '0.9.11';
+	$setup_info['addressbook']['app_order'] = 4;
+	$setup_info['addressbook']['tables'] = "";
+	$hooks = Array();
+	$hooks_string = implode (',', $hooks);
+	$setup_info['addressbook']['hooks'] = $hooks_string;
+?>
\ No newline at end of file
diff --git a/addressbook/setup/setup_info.inc.php b/addressbook/setup/setup_info.inc.php
deleted file mode 100644
index b6996dc8b6..0000000000
--- a/addressbook/setup/setup_info.inc.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$setup_info["addressbook"] = array("name" => "Addressbook", "app_order" => 4, "version" => $phpgw_info["server"]["versions"]["phpgwapi"]);
-?>
diff --git a/admin/setup/details.inc.php b/admin/setup/details.inc.php
deleted file mode 100644
index 92f66d77f8..0000000000
--- a/admin/setup/details.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-	include('../version.inc.php');
-	$phpgw_info['setup']['admin']['name'] = 'Administration';
-	$phpgw_info['setup']['admin']['version'] = $phpgw_info['server']['versions']['admin'];
-	$phpgw_info['setup']['admin']['app_order'] = 1;
-	$phpgw_info['setup']['admin']['tables'] = "";
-	$hooks = Array();
-	$hooks_string = implode (',', $hooks);
-	$phpgw_info['setup']['admin']['hooks'] = $hooks_string;
-?>
\ No newline at end of file
diff --git a/admin/setup/setup.inc.php b/admin/setup/setup.inc.php
new file mode 100755
index 0000000000..d37372d2fc
--- /dev/null
+++ b/admin/setup/setup.inc.php
@@ -0,0 +1,9 @@
+<?php
+	$setup_info['admin']['name'] = 'Administration';
+	$setup_info['admin']['version'] = '0.9.11';
+	$setup_info['admin']['app_order'] = 1;
+	$setup_info['admin']['tables'] = "";
+	$hooks = Array();
+	$hooks_string = implode (',', $hooks);
+	$setup_info['admin']['hooks'] = $hooks_string;
+?>
\ No newline at end of file
diff --git a/admin/setup/setup_info.inc.php b/admin/setup/setup_info.inc.php
deleted file mode 100644
index 1341397ee4..0000000000
--- a/admin/setup/setup_info.inc.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$setup_info["admin"] = array("name" => "Admin", "app_order" => 1, "version" => $phpgw_info["server"]["versions"]["phpgwapi"]);
-?>
diff --git a/calendar/setup/setup.inc.php b/calendar/setup/setup.inc.php
new file mode 100755
index 0000000000..24528764a4
--- /dev/null
+++ b/calendar/setup/setup.inc.php
@@ -0,0 +1,9 @@
+<?php
+	$setup_info['calendar']['name'] = 'Calendar';
+	$setup_info['calendar']['version'] = '0.9.11';
+	$setup_info['calendar']['app_order'] = 3;
+	$setup_info['calendar']['tables'] = "";
+	$hooks = Array();
+	$hooks_string = implode (',', $hooks);
+	$setup_info['calendar']['hooks'] = $hooks_string;
+?>
\ No newline at end of file
diff --git a/calendar/setup/setup_info.inc.php b/calendar/setup/setup_info.inc.php
deleted file mode 100644
index 2dca033dac..0000000000
--- a/calendar/setup/setup_info.inc.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$setup_info["calendar"] = array("name" => "Calendar", "app_order" => 3, "version" => $phpgw_info["server"]["versions"]["phpgwapi"]);
-?>
diff --git a/phpgwapi/setup/details.inc.php b/phpgwapi/setup/setup.inc.php
old mode 100644
new mode 100755
similarity index 58%
rename from phpgwapi/setup/details.inc.php
rename to phpgwapi/setup/setup.inc.php
index fa52b3c586..8b744f6cbc
--- a/phpgwapi/setup/details.inc.php
+++ b/phpgwapi/setup/setup.inc.php
@@ -1,8 +1,7 @@
 <?php
-	include('../version.inc.php');
-	$phpgw_info['setup']['phpgwapi']['name'] = 'phpgwapi';
-	$phpgw_info['setup']['phpgwapi']['version'] = $phpgw_info['server']['versions']['phpgwapi'];
-//	$phpgw_info['setup']['phpgwapi']['app_order'] = '6';
+	$setup_info['phpgwapi']['name'] = 'phpgwapi';
+	$setup_info['phpgwapi']['version'] = '0.9.11';
+//	$setup_info['phpgwapi']['app_order'] = '6';
 	$tables = Array();
 	$tables[] = 'phpgw_sessions';
 	$tables[] = 'phpgw_preferences';
@@ -17,8 +16,8 @@
 	$tables[] = 'phpgw_lang';
 	$tables[] = 'phpgw_languages';
 	$tables_string = implode (',', $tables);
-	$phpgw_info['setup']['phpgwapi']['tables'] = $tables_string;
+	$setup_info['phpgwapi']['tables'] = $tables_string;
 	$hooks = Array();
 	$hooks_string = implode (',', $hooks);
-	$phpgw_info['setup']['phpgwapi']['hooks'] = $hooks_string;
+	$setup_info['phpgwapi']['hooks'] = $hooks_string;
 ?>
\ No newline at end of file
diff --git a/preferences/setup/details.inc.php b/preferences/setup/details.inc.php
deleted file mode 100644
index ae1ba8168e..0000000000
--- a/preferences/setup/details.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-	include('../version.inc.php');
-	$phpgw_info['setup']['preferences']['name'] = 'Preferences';
-	$phpgw_info['setup']['preferences']['version'] = $phpgw_info['server']['versions']['preferences'];
-	$phpgw_info['setup']['preferences']['app_order'] = 1;
-	$phpgw_info['setup']['preferences']['tables'] = "";
-	$hooks = Array();
-	$hooks_string = implode (',', $hooks);
-	$phpgw_info['setup']['preferences']['hooks'] = $hooks_string;
-?>
\ No newline at end of file
diff --git a/preferences/setup/setup.inc.php b/preferences/setup/setup.inc.php
new file mode 100755
index 0000000000..9d7796e925
--- /dev/null
+++ b/preferences/setup/setup.inc.php
@@ -0,0 +1,9 @@
+<?php
+	$setup_info['preferences']['name'] = 'Preferences';
+	$setup_info['preferences']['version'] = '0.9.11';
+	$setup_info['preferences']['app_order'] = 1;
+	$setup_info['preferences']['tables'] = "";
+	$hooks = Array();
+	$hooks_string = implode (',', $hooks);
+	$setup_info['preferences']['hooks'] = $hooks_string;
+?>
\ No newline at end of file