diff --git a/install/updatesql.php b/install/updatesql.php
index 12274481..5be6af9d 100644
--- a/install/updatesql.php
+++ b/install/updatesql.php
@@ -123,8 +123,9 @@ if(!isset($settings['panel']['frontend'])
 	include_once ('./updates/froxlor/upgrade_syscp.inc.php');
 
 }
-if(!isset($settings['panel']['frontend'])
-  || $settings['panel']['frontend'] == 'froxlor')
+
+if(isset($settings['panel']['frontend'])
+  && $settings['panel']['frontend'] == 'froxlor')
 {
 	if($settings['panel']['version'] == '0.9-r1')
 	{
diff --git a/lib/cron_init.php b/lib/cron_init.php
index 733aaae7..246f1793 100644
--- a/lib/cron_init.php
+++ b/lib/cron_init.php
@@ -136,27 +136,6 @@ fwrite($debugHandler, 'Table definitions included' . "\n");
 fwrite($debugHandler, 'Database Class has been loaded' . "\n");
 $db = new db($sql['host'], $sql['user'], $sql['password'], $sql['db']);
 
-// If one cronscript needs root, it should say $needrootdb = true before the include
-if(isset($needrootdb)
-   && $needrootdb === true)
-{
-	$db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], '');
-
-	if($db_root->link_id == 0)
-	{
-		/**
-		 * Do not proceed further if no database connection could be established
-		 */
-
-		fclose($debugHandler);
-		unlink($lockfile);
-		die('root can\'t connect to mysqlserver. Please check userdata.inc.php! Exiting...');
-	}
-
-	unset($db_root->password);
-	fwrite($debugHandler, 'Database-rootconnection established' . "\n");
-}
-
 if($db->link_id == 0)
 {
 	/**
@@ -198,45 +177,6 @@ fwrite($debugHandler, 'Froxlor Version and Database Version are correct' . "\n")
 
 $cronscriptDebug = ($settings['system']['debug_cron'] == '1') ? true : false;
 
-$cronbasedir = makeCorrectDir($pathtophpfiles . '/scripts/');
-$crondir = new DirectoryIterator($cronbasedir);
-$cronfilename = basename($_SERVER['PHP_SELF'], '.php');
-$cronscriptFullName = makeCorrectFile($cronbasedir . basename($_SERVER['PHP_SELF']));
-$inc_crons = array();
-foreach($crondir as $file)
-{
-	if(!$file->isDot()
-	   && !$file->isDir()
-	   && preg_match("/^" . $cronfilename . "\.inc\.(.*)\.php$/D", $file->getFilename()))
-	{
-		if(fileowner($cronscriptFullName) == $file->getOwner()
-		   && filegroup($cronscriptFullName) == $file->getGroup()
-		   && $file->isReadable())
-		{
-			$inc_crons[] = $file->getPathname();
-		}
-		else
-		{
-			fwrite($debugHandler, 'WARNING! uid and/or gid of "' . $cronscriptFullName . '" and "' . $file->getPathname() . '" don\'t match! Execution aborted!' . "\n");
-			fclose($debugHandler);
-			die('WARNING! uid and/or gid of "' . $cronscriptFullName . '" and "' . $file->getPathname() . '" don\'t match! Execution aborted!');
-		}
-	}
-}
-
-if(isset($inc_crons[0]))
-{
-	natsort($inc_crons);
-	foreach($inc_crons as $cfile)
-	{
-		fwrite($debugHandler, 'Including ...' . $cfile . "\n");
-		include_once ($cfile);
-	}
-}
-
-unset($file, $crondir, $cronname, $cronscriptFullName, $cronfilename, $cronbasedir);
-fwrite($debugHandler, 'Functions have been included' . "\n");
-
 /**
  * Create a new idna converter
  */
diff --git a/lib/functions/froxlor/function.includeCronjobs.php b/lib/functions/froxlor/function.includeCronjobs.php
new file mode 100644
index 00000000..83e9d180
--- /dev/null
+++ b/lib/functions/froxlor/function.includeCronjobs.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Functions
+ * @version    $Id: $
+ */
+
+function includeCronjobs($path, $debugHandler)
+{
+	$cronbasedir = makeCorrectDir($path);
+	$crondir = new DirectoryIterator($cronbasedir);
+
+	foreach($crondir as $file)
+	{
+		if($file->isDot()) continue;
+
+		if($file->isFile())
+		{
+			if(fileowner(__FILE__) == $file->getOwner()
+			&& filegroup(__FILE__) == $file->getGroup()
+			&& $file->isReadable())
+			{
+				fwrite($debugHandler, 'Including ...' . $file->getPathname() . "\n");
+				include_once($file->getPathname());
+			}
+			else
+			{
+				fwrite($debugHandler, 'WARNING! uid and/or gid of "' . __FILE__ . '" and "' . $file->getPathname() . '" don\'t match! Execution aborted!' . "\n");
+				fclose($debugHandler);
+				die('WARNING! uid and/or gid of "' . __FILE__ . '" and "' . $file->getPathname() . '" don\'t match! Execution aborted!');
+			}
+		}
+	}
+}
diff --git a/lib/functions/froxlor/function.openRootDB.php b/lib/functions/froxlor/function.openRootDB.php
new file mode 100644
index 00000000..1245ad2b
--- /dev/null
+++ b/lib/functions/froxlor/function.openRootDB.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Functions
+ * @version    $Id: $
+ */
+
+/*
+ * Function openRootDB
+ *
+ * creates a mysql-connection as root-user
+ * and stores it in the global variable $db_root
+ *
+ * @param	int		debugHandler (file-object)
+ * @param	int		lockfile (file-object)
+ *
+ * @return	null
+ */
+function openRootDB($debugHandler, $lockfile)
+{
+	global $db_root;
+
+	// If one cronscript needs root, it should say $needrootdb = true before the include
+	if(isset($needrootdb)
+	&& $needrootdb === true)
+	{
+		$db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], '');
+
+		if($db_root->link_id == 0)
+		{
+			/**
+			 * Do not proceed further if no database connection could be established
+			 */
+
+			fclose($debugHandler);
+			unlink($lockfile);
+			die('root can\'t connect to mysqlserver. Please check userdata.inc.php! Exiting...');
+		}
+
+		unset($db_root->password);
+		fwrite($debugHandler, 'Database-rootconnection established' . "\n");
+	}
+}
+
+function closeRootDB()
+{
+	global $db_root;
+	if(isset($db_root)) unset($db_root);
+}
diff --git a/scripts/froxlor_master_cronjob.php b/scripts/froxlor_master_cronjob.php
new file mode 100644
index 00000000..ba6f8f2d
--- /dev/null
+++ b/scripts/froxlor_master_cronjob.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Cron
+ * @version    $Id: $
+ */
+
+include_once(dirname(__FILE__) . '/../lib/cron_init.php');
+
+/*
+ * include jobs that run always (5 minutes if cron is setup that way)
+ */
+includeCronjobs($pathtophpfiles . '/scripts/jobs/always/', $debugHandler);
+
+/*
+ * include hourly jobs
+ */
+$today = time();
+if(date('i', $today) == '00')
+{
+	includeCronjobs($pathtophpfiles . '/scripts/jobs/hourly/', $debugHandler);
+}
+
+/*
+ * include daily jobs (once a day)
+ */
+$today = time();
+if(date('Hi', $today) == '0000')
+{
+	includeCronjobs($pathtophpfiles . '/scripts/jobs/daily/', $debugHandler);
+}
+
+/*
+ * include daily jobs (once a day)
+ */
+$today = time();
+if(date('dHi', $today) == '010000')
+{
+	includeCronjobs($pathtophpfiles . '/scripts/jobs/monthly/', $debugHandler);
+}
+
+fwrite($debugHandler, 'Cronfiles have been included' . "\n");
+
+
+/*
+ * we have to check the system's last guid with every cron run
+ * in case the admin installed new software which added a new user
+ * so users in the database don't conflict with system users
+ */
+$cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'Checking system\'s last guid');
+checkLastGuid($settings['system']['lastguid']);
+
+/*
+ * shutdown cron
+ */
+include_once($pathtophpfiles . '/lib/cron_shutdown.php');
+
+?>
diff --git a/scripts/cron_apsinstaller.php b/scripts/jobs/always/cron_apsinstaller.php
similarity index 84%
rename from scripts/cron_apsinstaller.php
rename to scripts/jobs/always/cron_apsinstaller.php
index 078123e9..17b27c76 100644
--- a/scripts/cron_apsinstaller.php
+++ b/scripts/jobs/always/cron_apsinstaller.php
@@ -17,10 +17,9 @@
  * @version    $Id$
  */
 
-$needrootdb = true;
-require (dirname(__FILE__) . '/../lib/cron_init.php');
+openRootDB($debugHandler, $lockfile);
 $Aps = new ApsInstaller($settings, $db, $db_root);
 $Aps->InstallHandler();
-require (dirname(__FILE__) . '/../lib/cron_shutdown.php');
+closeRootDB();
 
-?>
\ No newline at end of file
+?>
diff --git a/scripts/cron_autoresponder.php b/scripts/jobs/always/cron_autoresponder.php
similarity index 96%
rename from scripts/cron_autoresponder.php
rename to scripts/jobs/always/cron_autoresponder.php
index 53d6cf7d..cc6a8b7b 100644
--- a/scripts/cron_autoresponder.php
+++ b/scripts/jobs/always/cron_autoresponder.php
@@ -21,8 +21,6 @@
  * @todo	   skip mail parsing after x bytes for large mails
  */
 
-$needrootdb = false;
-require (dirname(__FILE__) . '/../lib/cron_init.php');
 $mail = new PHPMailer();
 
 //dont do anything when module is disabled
@@ -229,14 +227,4 @@ if($db->num_rows($result) > 0)
 	}
 }
 
-/**
- * STARTING CRONSCRIPT FOOTER
- */
-
-include ($pathtophpfiles . '/lib/cron_shutdown.php');
-
-/**
- * END CRONSCRIPT FOOTER
- */
-
 ?>
diff --git a/scripts/cron_legacy.php b/scripts/jobs/always/cron_legacy.php
similarity index 75%
rename from scripts/cron_legacy.php
rename to scripts/jobs/always/cron_legacy.php
index 4d70823a..59fcb41a 100644
--- a/scripts/cron_legacy.php
+++ b/scripts/jobs/always/cron_legacy.php
@@ -17,20 +17,7 @@
  * @version    $Id$
  */
 
-/**
- * STARTING REDUNDANT CODE, WHICH IS SOME KINDA HEADER FOR EVERY CRON SCRIPT.
- * When using this "header" you have to change $lockFilename for your needs.
- * Don't forget to also copy the footer which closes database connections
- * and the lockfile! (Note: This "header" also establishes a mysql-root-
- * connection, if you don't need it, see for the header in cron_tasks.php)
- */
-
-$needrootdb = true;
-include (dirname(__FILE__) . '/../lib/cron_init.php');
-
-/**
- * END REDUNDANT CODE (CRONSCRIPT "HEADER")
- */
+openRootDB($debugHandler, $lockfile);
 
 /**
  * Check if table exists, otherwise create it
@@ -69,14 +56,4 @@ while($cronFileIncludeRow = $db->fetch_array($cronFileIncludeResult))
 	}
 }
 
-/**
- * STARTING CRONSCRIPT FOOTER
- */
-
-include ($pathtophpfiles . '/lib/cron_shutdown.php');
-
-/**
- * END CRONSCRIPT FOOTER
- */
-
 ?>
\ No newline at end of file
diff --git a/scripts/cron_lighttp.htaccess.php b/scripts/jobs/always/cron_lighttp.htaccess.php
similarity index 87%
rename from scripts/cron_lighttp.htaccess.php
rename to scripts/jobs/always/cron_lighttp.htaccess.php
index eb3cb90b..aa7c2a62 100644
--- a/scripts/cron_lighttp.htaccess.php
+++ b/scripts/jobs/always/cron_lighttp.htaccess.php
@@ -17,19 +17,6 @@
  * @version    $Id$
  */
 
-/**
- * STARTING REDUNDANT CODE, WHICH IS SOME KINDA HEADER FOR EVERY CRON SCRIPT.
- * When using this "header" you have to change $lockFilename for your needs.
- * Don't forget to also copy the footer which closes database connections
- * and the lockfile!
- */
-
-include (dirname(__FILE__) . '/../lib/cron_init.php');
-
-/**
- * END REDUNDANT CODE (CRONSCRIPT "HEADER")
- */
-
 /**
  * LOOK INTO EVERY CUSTOMER DIR TO SEE IF THERE ARE ANY .HTACCESS FILE TO "TRANSLATE"
  */
@@ -54,16 +41,6 @@ else
 	fwrite($debugHandler, '  cron_lighttp.htaccess: You don\'t use Lighttpd, you do not have to run this cronscript!' . "\n");
 }
 
-/**
- * STARTING CRONSCRIPT FOOTER
- */
-
-include ($pathtophpfiles . '/lib/cron_shutdown.php');
-
-/**
- * END CRONSCRIPT FOOTER
- */
-
 /**
  * FUNCTIONS
  */
diff --git a/scripts/cron_tasks.inc.dns.10.bind.php b/scripts/jobs/always/cron_tasks.inc.dns.10.bind.php
similarity index 100%
rename from scripts/cron_tasks.inc.dns.10.bind.php
rename to scripts/jobs/always/cron_tasks.inc.dns.10.bind.php
diff --git a/scripts/cron_tasks.inc.http.10.apache.php b/scripts/jobs/always/cron_tasks.inc.http.10.apache.php
similarity index 100%
rename from scripts/cron_tasks.inc.http.10.apache.php
rename to scripts/jobs/always/cron_tasks.inc.http.10.apache.php
diff --git a/scripts/cron_tasks.inc.http.15.apache_fcgid.php b/scripts/jobs/always/cron_tasks.inc.http.15.apache_fcgid.php
similarity index 100%
rename from scripts/cron_tasks.inc.http.15.apache_fcgid.php
rename to scripts/jobs/always/cron_tasks.inc.http.15.apache_fcgid.php
diff --git a/scripts/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/always/cron_tasks.inc.http.20.lighttpd.php
similarity index 100%
rename from scripts/cron_tasks.inc.http.20.lighttpd.php
rename to scripts/jobs/always/cron_tasks.inc.http.20.lighttpd.php
diff --git a/scripts/cron_tasks.inc.http.25.lighttpd_fcgid.php b/scripts/jobs/always/cron_tasks.inc.http.25.lighttpd_fcgid.php
similarity index 100%
rename from scripts/cron_tasks.inc.http.25.lighttpd_fcgid.php
rename to scripts/jobs/always/cron_tasks.inc.http.25.lighttpd_fcgid.php
diff --git a/scripts/cron_tasks.php b/scripts/jobs/always/cron_tasks.php
similarity index 91%
rename from scripts/cron_tasks.php
rename to scripts/jobs/always/cron_tasks.php
index eaba25f9..5b22b0b3 100644
--- a/scripts/cron_tasks.php
+++ b/scripts/jobs/always/cron_tasks.php
@@ -17,19 +17,6 @@
  * @version    $Id$
  */
 
-/**
- * STARTING REDUNDANT CODE, WHICH IS SOME KINDA HEADER FOR EVERY CRON SCRIPT.
- * When using this "header" you have to change $lockFilename for your needs.
- * Don't forget to also copy the footer which closes database connections
- * and the lockfile!
- */
-
-include (dirname(__FILE__) . '/../lib/cron_init.php');
-
-/**
- * END REDUNDANT CODE (CRONSCRIPT "HEADER")
- */
-
 /**
  * LOOK INTO TASKS TABLE TO SEE IF THERE ARE ANY UNDONE JOBS
  */
@@ -257,24 +244,6 @@ if($db->num_rows($result_tasks) != 0)
 	unset($where);
 }
 
-$db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = UNIX_TIMESTAMP() WHERE `settinggroup` = \'system\'   AND `varname`      = \'last_tasks_run\' ');
-
-/*
- * we have to check the system's last guid with every cron run
- * in case the admin installed new software which added a new user
- * so users in the database don't conflict with system users
- */
-$cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'Checking system\'s last guid');
-checkLastGuid($settings['system']['lastguid']);
-
-/**
- * STARTING CRONSCRIPT FOOTER
- */
-
-include ($pathtophpfiles . '/lib/cron_shutdown.php');
-
-/**
- * END CRONSCRIPT FOOTER
- */
+$db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = UNIX_TIMESTAMP() WHERE `settinggroup` = \'system\'   AND `varname` = \'last_tasks_run\' ');
 
 ?>
diff --git a/scripts/cron_traffic.inc.functions.php b/scripts/jobs/daily/cron_traffic.inc.functions.php
similarity index 100%
rename from scripts/cron_traffic.inc.functions.php
rename to scripts/jobs/daily/cron_traffic.inc.functions.php
diff --git a/scripts/cron_traffic.php b/scripts/jobs/daily/cron_traffic.php
similarity index 95%
rename from scripts/cron_traffic.php
rename to scripts/jobs/daily/cron_traffic.php
index 9d094b62..a04c06c7 100644
--- a/scripts/cron_traffic.php
+++ b/scripts/jobs/daily/cron_traffic.php
@@ -17,20 +17,7 @@
  * @version    $Id$
  */
 
-/**
- * STARTING REDUNDANT CODE, WHICH IS SOME KINDA HEADER FOR EVERY CRON SCRIPT.
- * When using this "header" you have to change $lockFilename for your needs.
- * Don't forget to also copy the footer which closes database connections
- * and the lockfile! (Note: This "header" also establishes a mysql-root-
- * connection, if you don't need it, see for the header in cron_tasks.php)
- */
-
-$needrootdb = true;
-include (dirname(__FILE__) . '/../lib/cron_init.php');
-
-/**
- * END REDUNDANT CODE (CRONSCRIPT "HEADER")
- */
+openRootDB($debugHandler, $lockfile);
 
 /**
  * TRAFFIC AND DISKUSAGE MESSURE
@@ -388,14 +375,6 @@ while($row = $db->fetch_array($result))
 
 $db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = UNIX_TIMESTAMP() WHERE `settinggroup` = \'system\'   AND `varname`      = \'last_traffic_run\' ');
 
-/**
- * STARTING CRONSCRIPT FOOTER
- */
-
-include ($pathtophpfiles . '/lib/cron_shutdown.php');
-
-/**
- * END CRONSCRIPT FOOTER
- */
+closeRootDB();
 
 ?>
diff --git a/scripts/cron_used_tickets_reset.php b/scripts/jobs/daily/cron_used_tickets_reset.php
similarity index 65%
rename from scripts/cron_used_tickets_reset.php
rename to scripts/jobs/daily/cron_used_tickets_reset.php
index 53f31105..424726e5 100644
--- a/scripts/cron_used_tickets_reset.php
+++ b/scripts/jobs/daily/cron_used_tickets_reset.php
@@ -17,21 +17,6 @@
  * @version    $Id$
  */
 
-/**
- * STARTING REDUNDANT CODE, WHICH IS SOME KINDA HEADER FOR EVERY CRON SCRIPT.
- * When using this "header" you have to change $lockFilename for your needs.
- * Don't forget to also copy the footer which closes database connections
- * and the lockfile! (Note: This "header" also establishes a mysql-root-
- * connection, if you don't need it, see for the header in cron_tasks.php)
- */
-
-$needrootdb = false;
-include (dirname(__FILE__) . '/../lib/cron_init.php');
-
-/**
- * END REDUNDANT CODE (CRONSCRIPT "HEADER")
- */
-
 /**
  * RESET USED TICKETS COUNTER
  */
@@ -49,14 +34,4 @@ if($cycle == '0'
 	$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `tickets_used` = '0'");
 }
 
-/**
- * STARTING CRONSCRIPT FOOTER
- */
-
-include ($pathtophpfiles . '/lib/cron_shutdown.php');
-
-/**
- * END CRONSCRIPT FOOTER
- */
-
 ?>
\ No newline at end of file
diff --git a/scripts/cron_apsupdater.php b/scripts/jobs/hourly/cron_apsupdater.php
similarity index 83%
rename from scripts/cron_apsupdater.php
rename to scripts/jobs/hourly/cron_apsupdater.php
index 4bcc4402..130844be 100644
--- a/scripts/cron_apsupdater.php
+++ b/scripts/jobs/hourly/cron_apsupdater.php
@@ -17,10 +17,7 @@
  * @version    $Id$
  */
 
-$needrootdb = false;
-require (dirname(__FILE__) . '/../lib/cron_init.php');
 $Aps = new ApsUpdater($db);
 $Aps->UpdateHandler();
-require (dirname(__FILE__) . '/../lib/cron_shutdown.php');
 
-?>
\ No newline at end of file
+?>
diff --git a/scripts/cron_ticketarchive.php b/scripts/jobs/monthly/cron_ticketarchive.php
similarity index 74%
rename from scripts/cron_ticketarchive.php
rename to scripts/jobs/monthly/cron_ticketarchive.php
index 7540d3a9..c49c643c 100644
--- a/scripts/cron_ticketarchive.php
+++ b/scripts/jobs/monthly/cron_ticketarchive.php
@@ -17,21 +17,6 @@
  * @version    $Id$
  */
 
-/**
- * STARTING REDUNDANT CODE, WHICH IS SOME KINDA HEADER FOR EVERY CRON SCRIPT.
- * When using this "header" you have to change $lockFilename for your needs.
- * Don't forget to also copy the footer which closes database connections
- * and the lockfile! (Note: This "header" also establishes a mysql-root-
- * connection, if you don't need it, see for the header in cron_tasks.php)
- */
-
-$needrootdb = false;
-include (dirname(__FILE__) . '/../lib/cron_init.php');
-
-/**
- * END REDUNDANT CODE (CRONSCRIPT "HEADER")
- */
-
 /**
  * ARCHIVING CLOSED TICKETS
  */
@@ -63,14 +48,4 @@ while($row_ticket = $db->fetch_array($result_tickets))
 fwrite($debugHandler, 'Archived ' . $archiving_count . ' tickets' . "\n");
 $db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = UNIX_TIMESTAMP() WHERE `settinggroup` = \'system\'   AND `varname`      = \'last_archive_run\' ');
 
-/**
- * STARTING CRONSCRIPT FOOTER
- */
-
-include ($pathtophpfiles . '/lib/cron_shutdown.php');
-
-/**
- * END CRONSCRIPT FOOTER
- */
-
 ?>
\ No newline at end of file
diff --git a/scripts/cron_traffic_report.php b/scripts/jobs/monthly/cron_traffic_report.php
similarity index 95%
rename from scripts/cron_traffic_report.php
rename to scripts/jobs/monthly/cron_traffic_report.php
index 9ab39914..517e778b 100644
--- a/scripts/cron_traffic_report.php
+++ b/scripts/jobs/monthly/cron_traffic_report.php
@@ -17,19 +17,6 @@
  * @version    $Id$
  */
 
-/**
- * STARTING REDUNDANT CODE, WHICH IS SOME KINDA HEADER FOR EVERY CRON SCRIPT.
- * When using this "header" you have to change $lockFilename for your needs.
- * Don't forget to also copy the footer which closes database connections
- * and the lockfile!
- */
-
-include (dirname(__FILE__) . '/../lib/cron_init.php');
-
-/**
- * END REDUNDANT CODE (CRONSCRIPT "HEADER")
- */
-
 fwrite($debugHandler, 'Trafficreport run started...' . "\n");
 $yesterday = time() - (60 * 60 * 24);
 
@@ -229,14 +216,5 @@ if(date('d') == '01')
 $db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = UNIX_TIMESTAMP()
             WHERE `settinggroup` = \'system\' AND `varname` = \'last_traffic_report_run\' ');
 
-/**
- * STARTING CRONSCRIPT FOOTER
- */
-
-include ($pathtophpfiles . '/lib/cron_shutdown.php');
-
-/**
- * END CRONSCRIPT FOOTER
- */
 
 ?>
diff --git a/templates/misc/configfiles/debian_etch/cron/etc_cron.d_froxlor b/templates/misc/configfiles/debian_etch/cron/etc_cron.d_froxlor
index 6bf8fd06..2efdde95 100644
--- a/templates/misc/configfiles/debian_etch/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/debian_etch/cron/etc_cron.d_froxlor
@@ -5,10 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_tasks.php
-0 0 * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_traffic.php
-30 0 * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_ticketarchive.php
-0 1 * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_used_tickets_reset.php
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_autoresponder.php
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_apsinstaller.php
-*/30 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_apsupdater.php
+*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/froxlor_master_cronjob.php
diff --git a/templates/misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor b/templates/misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor
index 6bf8fd06..2efdde95 100644
--- a/templates/misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor
@@ -5,10 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_tasks.php
-0 0 * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_traffic.php
-30 0 * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_ticketarchive.php
-0 1 * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_used_tickets_reset.php
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_autoresponder.php
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_apsinstaller.php
-*/30 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_apsupdater.php
+*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/froxlor_master_cronjob.php
diff --git a/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor b/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor
index 26729757..04d15061 100644
--- a/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor
@@ -7,10 +7,4 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Please check that all following paths are correct
 #
-*/5 * * * *	root	/usr/lib/php5/bin/php -q /var/www/froxlor/scripts/cron_tasks.php
-0 0 * * *	root	/usr/lib/php5/bin/php -q /var/www/froxlor/scripts/cron_traffic.php
-30 0 * * *	root	/usr/lib/php5/bin/php -q /var/www/froxlor/scripts/cron_ticketarchive.php
-0 1 * * *	root	/usr/lib/php5/bin/php -q /var/www/froxlor/scripts/cron_used_tickets_reset.php
-*/5 * * * *	root	/usr/lib/php5/bin/php -q /var/www/froxlor/scripts/cron_autoresponder.php
-*/5 * * * *	root	/usr/lib/php5/bin/php -q /var/www/froxlor/scripts/cron_apsinstaller.php
-*/30 * * * *	root	/usr/lib/php5/bin/php -q /var/www/froxlor/scripts/cron_apsupdater.php
\ No newline at end of file
+*/5 * * * *	root	/usr/lib/php5/bin/php -q /var/www/froxlor/scripts/froxlor_master_cronjob.php
diff --git a/templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_froxlor b/templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_froxlor
index cf0d97b7..bf05b690 100644
--- a/templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_froxlor
@@ -5,10 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/php5 -q /srv/www/htdocs/froxlor/scripts/cron_tasks.php
-0 0 * * *	root	/usr/bin/php5 -q /srv/www/htdocs/froxlor/scripts/cron_traffic.php
-30 0 * * *	root	/usr/bin/php5 -q /srv/www/htdocs/froxlor/scripts/cron_ticketarchive.php
-0 1 * * *	root	/usr/bin/php5 -q /var/www/htdocs/froxlor/scripts/cron_used_tickets_reset.php
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/htdocs/froxlor/scripts/cron_autoresponder.php
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/htdocs/froxlor/scripts/cron_apsinstaller.php
-*/30 * * * *	root	/usr/bin/php5 -q /var/www/htdocs/froxlor/scripts/cron_apsupdater.php
+*/5 * * * *	root	/usr/bin/php5 -q /srv/www/htdocs/froxlor/scripts/froxlor_master_cronjob.php
diff --git a/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor b/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor
index 6bf8fd06..2efdde95 100644
--- a/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor
@@ -5,10 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_tasks.php
-0 0 * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_traffic.php
-30 0 * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_ticketarchive.php
-0 1 * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_used_tickets_reset.php
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_autoresponder.php
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_apsinstaller.php
-*/30 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/cron_apsupdater.php
+*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/froxlor_master_cronjob.php