diff --git a/phpgwapi/setup/phpgw_de.lang b/phpgwapi/setup/phpgw_de.lang
index ab02099768..a2e9622518 100644
--- a/phpgwapi/setup/phpgw_de.lang
+++ b/phpgwapi/setup/phpgw_de.lang
@@ -138,8 +138,8 @@ july	common	de	Juli
 june	common	de	Juni
 last name	common	de	Name
 lastname	common	de	Name
-login	common	de	Login
-logout	common	de	Logout
+login	common	de	Anmelden
+logout	common	de	Abmelden
 main category	common	de	Hauptkategorie
 main screen	common	de	Startseite
 manual	common	de	Handbuch
@@ -171,7 +171,7 @@ password has been updated	common	de	Passwort wurde aktualisiert
 please enter a name	common	de	Bitte geben Sie einen Namen ein !
 please set your global preferences	common	de	Bitte editieren Sie Ihre globalen Einstellungen !
 please set your preferences for this application	common	de	Bitte editieren Sie Ihre Einstellungen für diese Applikation !
-powered by phpgroupware version x	common	de	Powered by <a href="http://www.phpgw.de">phpGroupWare</a> version %1
+powered by	common	de	Powered by	
 preferences	common	de	Einstellungen
 print	common	de	Drucken
 priority	common	de	Priorität
@@ -186,11 +186,11 @@ september 	common	de	September
 session has been killed	common	de	Session wurde gelöscht
 show all	common	de	alle anzeigen
 showing x	common	de	%1 Einträge
-showing x - x of x	common	de	%1 Einträge - %2 von %3
+showing x - x of x	common	de	%1 - %2 von %3 Einträgen
 start date	common	de	Startdatum
 start time	common	de	Startzeit
 status	common	de	Status
-sorry, your login has expired	login	de	Sorry - Login abgelaufen
+sorry, your login has expired	login	de	Ihre Anmeldung ist abgelaufen !
 subject	common	de	Betreff
 submit	common	de	Absenden
 sunday	common	de	Sonntag
diff --git a/phpgwapi/setup/setup.inc.php b/phpgwapi/setup/setup.inc.php
index a7522330f6..fd20edffc3 100755
--- a/phpgwapi/setup/setup.inc.php
+++ b/phpgwapi/setup/setup.inc.php
@@ -18,10 +18,32 @@
 	$setup_info['phpgwapi']['enable']    = 3;
 	$setup_info['phpgwapi']['app_order'] = 1;
 
-	$setup_info['phpgwapi']['author']      = 'phpGW Core';
+	$setup_info['phpgwapi']['author']      = 'phpGroupWare coreteam';
 	$setup_info['phpgwapi']['description'] = 'The core of phpGroupWare, the API itself...';
-	$setup_info['phpgwapi']['maintainer']  = 'phpGW Core';
-	$setup_info['phpgwapi']['maintainer_email'] = 'ceb@phpgroupware.org<br>jengo@phpgroupware.org<br>milosch@phpgroupware.org<br>seek3r@phpgroupware.org<br>skeeter@phpgroupware.org';
+
+	$setup_info['phpgwapi']['maintainer'][]  = array
+	(
+		'name'	=> 'Joseph Engo',
+		'email'	=> 'jengo@phpgroupware.org'
+	);
+
+	$setup_info['phpgwapi']['maintainer'][]  = array
+	(
+		'name'	=> 'Marc A. Peters',
+		'email'	=> 'skeeter@phpgroupware.org'
+	);
+
+	$setup_info['phpgwapi']['maintainer'][]	= array
+	(
+		'name'	=> 'Bettina Gille',
+		'email'	=> 'ceb@phpgroupware.org'
+	);
+
+	$setup_info['phpgwapi']['maintainer'][]  = array
+	(
+		'name'	=> 'Dan Kuykendall',
+		'email'	=> 'seek3r@phpgroupware.org'
+	);
 
 	/* The tables this app creates */
 	$setup_info['phpgwapi']['tables'][]  = 'phpgw_sessions';
@@ -47,7 +69,6 @@
 
 	/* Basic information about this app */
 	$setup_info['notifywindow']['name']      = 'notifywindow';
-	$setup_info['notifywindow']['title']     = 'Notify Window';
 	$setup_info['notifywindow']['version']   = '0.9.13.002';
 	$setup_info['notifywindow']['enable']    = 2;
 	$setup_info['notifywindow']['app_order'] = 1;