diff --git a/about.php b/about.php
index 89c9fa0a7b..6d7c253123 100644
--- a/about.php
+++ b/about.php
@@ -16,18 +16,39 @@
 
 	$app = $HTTP_GET_VARS['app'];
 
-	if ($app)
-	{
-		$included = $GLOBALS['phpgw']->hooks->single('about',$app);
-	}
-
 	$GLOBALS['phpgw']->xslttpl->add_file(array('about'));
 
-	if ($included)
+	if ($app == 'phpGroupWare' || $app == 'about')
 	{
-		$app_data = about_app();
+		$app = 'phpgwapi';
 	}
+	$app_data['title'] = str_replace('- ','-',ucwords(str_replace('_','- ',$app)));
+	$app_data['icon'] = $GLOBALS['phpgw']->common->image($app,'navbar');
+	
+	$setup_file = PHPGW_INCLUDE_ROOT . '/' . $app . '/setup/setup.inc.php';
 
+	if (@file_exists($setup_file))
+	{
+		include($setup_file);
+		
+		$fields = array(
+			'version',
+			'description',
+			'note',
+			'author',
+			'maintainer',
+			'maintainer_email',
+			'license',
+			'based_on',
+			'based_on_url'
+		);
+		while (list(,$field) = each($fields))
+		{
+			$app_data[$field] = $setup_info[$app][$field];
+		}
+		$app_data['maintainer_email'] = ereg_replace('([-_a-zA-Z0-9.]+@[-_a-zA-Z0-9.]+)',
+			'<a href="mailto:\\1">\\1</a>',$app_data['maintainer_email']);
+	}
 	$data = array
 	(
 		'phpgw_logo'			=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
@@ -35,9 +56,14 @@
 		'lang_version'			=> lang('version'),
 		'phpgw_version'			=> 'phpGroupWare API ' . $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],
 		'phpgw_descr'			=> lang('is a multi-user, web-based groupware suite written in PHP'), 
-		'about_app'				=> $app_data
+		'about_app'				=> $app_data + array(
+			'lang_version'    => lang('version'),
+			'lang_written_by' => lang('written by'),
+			'lang_based_on'   => lang('based on'),
+			'lang_maintainer' => lang('maintainer'),
+			'lang_license'    => lang('license')
+		)
 	);
 
 	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('about_data' => $data));
-	//$GLOBALS['phpgw']->xslttpl->pparse();
 ?>