diff --git a/etemplate/doc/et_media/setup/setup.inc.php b/etemplate/doc/et_media/setup/setup.inc.php
new file mode 100644
index 0000000000..95fa16b139
--- /dev/null
+++ b/etemplate/doc/et_media/setup/setup.inc.php
@@ -0,0 +1,42 @@
+<?php
+	/**************************************************************************\
+	* eGroupWare - Editable Templates: Example App of the tutorial             *
+	* http://www.egroupware.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.                                              *
+	\**************************************************************************/
+
+	/* $Id$ */
+
+	$setup_info['et_media']['name']      = 'et_media';
+	$setup_info['et_media']['title']     = 'eT-Media';
+	$setup_info['et_media']['version']   = '1.0.0';
+	$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'] = 
+ 	$setup_info['et_media']['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 eGroupWare.<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>.';
+
+	/* 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','1.0.0','1.0.1')
+	);
+	$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','1.0.0')
+	);
diff --git a/etemplate/doc/et_notes/setup/setup.inc.php b/etemplate/doc/et_notes/setup/setup.inc.php
new file mode 100644
index 0000000000..99d93c288f
--- /dev/null
+++ b/etemplate/doc/et_notes/setup/setup.inc.php
@@ -0,0 +1,43 @@
+<?php
+	/**************************************************************************\
+	* eGroupWare - Notes eTemplates Port                                       *
+	* http://www.egroupware.org                                                *
+	* Ported to eTemplate 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.                                              *
+	\**************************************************************************/
+	/* $Id$ */
+
+	$setup_info['et_notes']['name']      = 'et_notes'; 
+	$setup_info['et_notes']['version']   = '0.9.15.001';
+	$setup_info['et_notes']['app_order'] = 8;
+	$setup_info['et_notes']['tables']    = array('phpgw_et_notes');
+	$setup_info['et_notes']['enable']    = 1;
+	$setup_info['et_notes']['licenze']   = 'GPL';
+	
+	$setup_info['et_notes']['description'] =
+		'Notes and short texts can go in here';
+	$setup_info['et_notes']['description'] =
+		'This is an eTemplate port of the notes app.';
+		
+	$setup_info['et_notes']['author'] = 'Bettina Gille, Andy Holman (LoCdOg)';
+	$setup_info['et_notes']['maintainer'] = 'Ralf Becker';
+	$setup_info['et_notes']['maintainer_email'] = 'ralfbecker@outdoor-training.de';
+
+	/* The hooks this app includes, needed for hooks registration */
+	$setup_info['et_notes']['hooks'][] = 'deleteaccount';
+	$setup_info['et_notes']['hooks'][] = 'admin';
+
+	/* Dependencies for this app to work */
+	$setup_info['et_notes']['depends'][] = array(
+		'appname'  => 'phpgwapi',
+		'versions' => Array('0.9.13','0.9.14','1.0.0','1.0.1')
+
+	);
+	$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','1.0.0')
+	);