diff --git a/psp_admin/setup/setup.inc.php b/psp_admin/setup/setup.inc.php
new file mode 100755
index 0000000000..8764be2827
--- /dev/null
+++ b/psp_admin/setup/setup.inc.php
@@ -0,0 +1,54 @@
+<?php
+    /**************************************************************************\
+    * eGroupWare - psp_admin                                                     *
+    * http://www.egroupware.org                                                *
+    * -----------------------------------------------                          *
+    *  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$ */
+
+	/* Basic information about this app */
+	$setup_info['psp_admin']['name']      = 'psp_admin';
+	$setup_info['psp_admin']['title']     = 'PSP Admin';
+	$setup_info['psp_admin']['version']   = '0.001';
+	$setup_info['psp_admin']['app_order'] = 90;
+	$setup_info['psp_admin']['enable']    = 1;
+
+	/* some info's for about.php and apps.egroupware.org */
+	$setup_info['psp_admin']['author']    = 'RVD';
+	$setup_info['psp_admin']['license']   = 'GPL';
+	$setup_info['psp_admin']['description'] =
+	'pspadmin';
+	$setup_info['psp_admin']['note'] =
+	'pspadmin';
+	$setup_info['psp_admin']['maintainer'] = 'Richard van Diessen';
+	$setup_info['psp_admin']['maintainer_email'] = 'richard@jataggo.com';
+
+	/* The hooks this app includes, needed for hooks registration */
+	$setup_info['psp_admin']['hooks'] = array(
+		'preferences',
+		'manual',
+		'home',
+		'settings'
+	);
+	$setup_info['psp_admin']['hooks']['sidebox_menu'] = 'psp_admin.ui_pspadmin.sidebox_menu';
+
+	/* Dependacies for this app to work */
+	$setup_info['psp_admin']['depends'][] = array(
+		'appname' => 'phpgwapi',
+		'versions' => array('1.0.0','1.0.1','1.2','1.3','1.3.005','1.3.006','1.4','1.5')
+	);
+	$setup_info['psp_admin']['depends'][] = array(
+	   'appname' => 'jinn',
+	   'versions' => array('0.9.021','0.9.026','0.9.1','0.9.031','0.9','1.0.0')
+	);
+	
+	/* The tables this app creates */
+	$setup_info['psp_admin']['tables'] = array('egw_psp_admin_links','egw_psp_admin_frontpage','egw_psp_admin_homepage','egw_psp_admin_contacts');
+
+
+
diff --git a/psp_admin/setup/tables_baseline.inc.php b/psp_admin/setup/tables_baseline.inc.php
new file mode 100644
index 0000000000..1987f548e0
--- /dev/null
+++ b/psp_admin/setup/tables_baseline.inc.php
@@ -0,0 +1,29 @@
+<?php
+	/**************************************************************************\
+	* eGroupWare - Setup                                                       *
+	* http://www.eGroupWare.org                                                *
+	* Created by eTemplates DB-Tools written by 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: class.db_tools.inc.php,v 1.32 2005/11/10 12:27:04 ralfbecker Exp $ */
+
+
+	$phpgw_baseline = array(
+		'egw_psp_admin_links' => array(
+			'fd' => array(
+				'id' => array('type' => 'auto'),
+				'name' => array('type' => 'varchar','precision' => '100'),
+				'description' => array('type' => 'text'),
+				'url' => array('type' => 'varchar','precision' => '250')
+			),
+			'pk' => array(),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		)
+	);
diff --git a/psp_admin/setup/tables_current.inc.php b/psp_admin/setup/tables_current.inc.php
new file mode 100644
index 0000000000..bea63081ae
--- /dev/null
+++ b/psp_admin/setup/tables_current.inc.php
@@ -0,0 +1,62 @@
+<?php
+	/**************************************************************************\
+	* eGroupWare - Setup                                                       *
+	* http://www.eGroupWare.org                                                *
+	* Created by eTemplates DB-Tools written by 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: class.db_tools.inc.php,v 1.32 2005/11/10 12:27:04 ralfbecker Exp $ */
+
+
+	$phpgw_baseline = array(
+		'egw_psp_admin_links' => array(
+			'fd' => array(
+				'id' => array('type' => 'auto'),
+				'name' => array('type' => 'varchar','precision' => '100'),
+				'description' => array('type' => 'text'),
+				'url' => array('type' => 'varchar','precision' => '250')
+			),
+			'pk' => array('id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'egw_psp_admin_frontpage' => array(
+			'fd' => array(
+				'id' => array('type' => 'auto'),
+				'title' => array('type' => 'varchar','precision' => '255'),
+				'pagecontent' => array('type' => 'longtext')
+			),
+			'pk' => array('id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'egw_psp_admin_homepage' => array(
+			'fd' => array(
+				'id' => array('type' => 'auto'),
+				'title' => array('type' => 'varchar','precision' => '254'),
+				'content' => array('type' => 'longtext')
+			),
+			'pk' => array('id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),
+		'egw_psp_admin_contacts' => array(
+			'fd' => array(
+				'id' => array('type' => 'auto'),
+				'name' => array('type' => 'varchar','precision' => '100'),
+				'email' => array('type' => 'varchar','precision' => '100')
+			),
+			'pk' => array('id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		)
+	);