diff --git a/etemplate/doc/et_media/setup/setup.inc.php b/etemplate/doc/et_media/setup/setup.inc.php
index 940a4e932c..c10b405796 100644
--- a/etemplate/doc/et_media/setup/setup.inc.php
+++ b/etemplate/doc/et_media/setup/setup.inc.php
@@ -18,7 +18,11 @@
 	$setup_info['et_media']['app_order'] = 100;     // at the end
 	$setup_info['et_media']['tables']    = array('phpgw_et_media');
 	$setup_info['et_media']['enable']    = 1;
-	$setup_info['et_media']['author']    = 'Ralf Becker';
+	$setup_info['infolog']['author'] = 
+ 	$setup_info['infolog']['maintainer'] = array(
+		'name'  => 'Ralf Becker',
+		'email' => 'ralfbecker@outdoor-training.de'
+	);
 	$setup_info['et_media']['license']   = 'GPL';
 	$setup_info['et_media']['description'] =
 		'<b>eTemplates</b> are a new widget-based template system for phpGroupWare.<br>
@@ -26,8 +30,6 @@
 	$setup_info['et_media']['note'] =
 		'For more information check out the <a href="etemplate/doc/etemplate.html" target="_blank">Tutorial</a>
 		and the <a href="etemplate/doc/referenz.html" target="_blank">Referenz Documentation</a>.';
-	$setup_info['et_media']['maintainer'] = 'Ralf Becker';
-	$setup_info['et_media']['maintainer_email'] = 'ralfbecker@outdoor-training.de';
 
 	/* Dependencies for this app to work */
 	$setup_info['et_media']['depends'][] = array(
diff --git a/etemplate/setup/setup.inc.php b/etemplate/setup/setup.inc.php
index a1aae31f1c..9f7bf547b4 100644
--- a/etemplate/setup/setup.inc.php
+++ b/etemplate/setup/setup.inc.php
@@ -18,7 +18,11 @@
 	$setup_info['etemplate']['tables']    = array('phpgw_etemplate');
 	$setup_info['etemplate']['enable']    = 1;
 
-	$setup_info['etemplate']['author']    = 'Ralf Becker';
+	$setup_info['infolog']['author'] = 
+ 	$setup_info['infolog']['maintainer'] = array(
+		'name'  => 'Ralf Becker',
+		'email' => 'ralfbecker@outdoor-training.de'
+	);
 	$setup_info['etemplate']['license']   = 'GPL';
 	$setup_info['etemplate']['description'] =
 		'<b>eTemplates</b> are a new widget-based template system for phpGroupWare with an
@@ -27,8 +31,6 @@
 	$setup_info['etemplate']['note'] =
 		'For more information check out the <a href="etemplate/doc/etemplate.html" target="_blank">Tutorial</a>
 		and the <a href="etemplate/doc/referenz.html" target="_blank">Referenz Documentation</a>.';
-	$setup_info['etemplate']['maintainer'] = 'Ralf Becker';
-	$setup_info['etemplate']['maintainer_email'] = 'ralfbecker@outdoor-training.de';
 
 	/* The hooks this app includes, needed for hooks registration */
 	//$setup_info['etemplate']['hooks'][] = 'preferences';
diff --git a/infolog/setup/setup.inc.php b/infolog/setup/setup.inc.php
index 584eba1725..72ca1fae5e 100755
--- a/infolog/setup/setup.inc.php
+++ b/infolog/setup/setup.inc.php
@@ -17,7 +17,11 @@
 	$setup_info['infolog']['tables']    = array('phpgw_infolog','phpgw_links');
 	$setup_info['infolog']['enable']    = 1;
 
-	$setup_info['infolog']['author'] = 'Ralf Becker';
+	$setup_info['infolog']['author'] = 
+ 	$setup_info['infolog']['maintainer'] = array(
+		'name'  => 'Ralf Becker',
+		'email' => 'ralfbecker@outdoor-training.de'
+	);
 	$setup_info['infolog']['license']  = 'GPL';
 	$setup_info['infolog']['description'] =
 		'<b>CRM</b> (customer-relation-management) type app using Addressbook providing 
@@ -39,8 +43,6 @@
 		It allows to interactivly assign fields, customize the values with regular 
 		expressions and direct calls to php-functions (e.g. to link the phone calls 
 		(again) to the addressbook entrys).';
- 	$setup_info['infolog']['maintainer'] = 'Ralf Becker';
-	$setup_info['infolog']['maintainer_email'] = 'ralfbecker@outdoor-training.de';
 
 	/* The hooks this app includes, needed for hooks registration */
 	$setup_info['infolog']['hooks'][] = 'preferences';