diff --git a/etemplate/doc/et_media/setup/setup.inc.php b/etemplate/doc/et_media/setup/setup.inc.php
index f4728f75c9..940a4e932c 100644
--- a/etemplate/doc/et_media/setup/setup.inc.php
+++ b/etemplate/doc/et_media/setup/setup.inc.php
@@ -1,17 +1,40 @@
 <?php
-        $setup_info['et_media']['name']      = 'et_media';
-        $setup_info['et_media']['title']     = 'eT-Media';
-        $setup_info['et_media']['version']   = '0.9.15.001';
-        $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;
+	/**************************************************************************\
+	* phpGroupWare - Editable Templates: Example App of the tutorial           *
+	* http://www.phpgroupware.org                                              *
+	" Written by Ralf Becker <RalfBecker@outdoor-training.de>                  *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
 
-        /* Dependencies for this app to work */
-        $setup_info['et_media']['depends'][] = array(
-                 'appname' => 'phpgwapi',
-                 'versions' => Array('0.9.13','0.9.14','0.9.15')
-        );
-        $setup_info['et_media']['depends'][] = array(   // this is only necessary as long the etemplate-class is not in the api
-                 'appname' => 'etemplate',
-                 'versions' => Array('0.9.13','0.9.14','0.9.15')
-        );
+	/* $Id$ */
+
+	$setup_info['et_media']['name']      = 'et_media';
+	$setup_info['et_media']['title']     = 'eT-Media';
+	$setup_info['et_media']['version']   = '0.9.15.001';
+	$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['et_media']['license']   = 'GPL';
+	$setup_info['et_media']['description'] =
+		'<b>eTemplates</b> are a new widget-based template system for phpGroupWare.<br>
+		<b>eT-Media</b> is the example application of the eTemplates tutorial.';
+	$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(
+				'appname' => 'phpgwapi',
+				'versions' => Array('0.9.13','0.9.14','0.9.15')
+	);
+	$setup_info['et_media']['depends'][] = array(   // this is only necessary as long the etemplate-class is not in the api
+				'appname' => 'etemplate',
+				'versions' => Array('0.9.13','0.9.14','0.9.15')
+	);
diff --git a/etemplate/setup/setup.inc.php b/etemplate/setup/setup.inc.php
index e36073b4c8..a1aae31f1c 100644
--- a/etemplate/setup/setup.inc.php
+++ b/etemplate/setup/setup.inc.php
@@ -18,10 +18,15 @@
 	$setup_info['etemplate']['tables']    = array('phpgw_etemplate');
 	$setup_info['etemplate']['enable']    = 1;
 
-	$setup_info['etemplate']['author'] = 'Ralf Becker';
-	$setup_info['etemplate']['license']  = 'GPL';
+	$setup_info['etemplate']['author']    = 'Ralf Becker';
+	$setup_info['etemplate']['license']   = 'GPL';
 	$setup_info['etemplate']['description'] =
-		'interactive editor for eTemplates (new template type) and database table-editor (creates tables_current.inc.php and updates autom. tables_update.inc.php)';
+		'<b>eTemplates</b> are a new widget-based template system for phpGroupWare with an
+		interactive editor and a database table-editor (creates tables_current.inc.php and
+		updates automaticaly tables_update.inc.php).';
+	$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';