diff --git a/modules/sanitycheck/config-templates/config-sanitycheck.php b/modules/sanitycheck/config-templates/config-sanitycheck.php
new file mode 100644
index 0000000000000000000000000000000000000000..ad607479f4b854b53bfa22c4c11e5e8743bfa6b4
--- /dev/null
+++ b/modules/sanitycheck/config-templates/config-sanitycheck.php
@@ -0,0 +1,18 @@
+<?php
+/* 
+ * The configuration of simpleSAMLphp sanitycheck package
+ */
+
+$config = array (
+
+	/*
+	 * Do you want to generate statistics using the cron module? If so, specify which cron tag to use.
+	 * Examples: daily, weekly
+	 * To not run statistics in cron, set value to 
+	 *     'cron_tag' => NULL,
+	 */
+	'cron_tag' => 'hourly',
+
+);
+
+?>
\ No newline at end of file
diff --git a/modules/sanitycheck/default-enable b/modules/sanitycheck/default-enable
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/modules/sanitycheck/hooks/hook_cron.php b/modules/sanitycheck/hooks/hook_cron.php
new file mode 100644
index 0000000000000000000000000000000000000000..bcd5d93c9cd999e2f6ec3c3482164e4bcff8c058
--- /dev/null
+++ b/modules/sanitycheck/hooks/hook_cron.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Hook to run a cron job.
+ *
+ * @param array &$croninfo  Output
+ */
+function sanitycheck_hook_cron(&$croninfo) {
+	assert('is_array($croninfo)');
+	assert('array_key_exists("summary", $croninfo)');
+	assert('array_key_exists("tag", $croninfo)');
+
+	$config = SimpleSAML_Configuration::getInstance();
+	$sconfig = $config->copyFromBase('sconfig', 'config-sanitycheck.php');
+	
+	if (is_null($sconfig->getValue('cron_tag', NULL))) return;
+	if ($sconfig->getValue('cron_tag', NULL) !== $croninfo['tag']) return;
+	
+	
+	$info = array();
+	$errors = array();
+	$hookinfo = array(
+		'info' => &$info,
+		'errors' => &$errors,
+	);
+	
+	SimpleSAML_Module::callHooks('sanitycheck', $hookinfo);
+	
+	if (count($errors) > 0) {
+		foreach ($errors AS $err) {
+			$croninfo['summary'][] = 'Sanitycheck error: ' . $err;
+		}
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/modules/sanitycheck/hooks/hook_frontpage.php b/modules/sanitycheck/hooks/hook_frontpage.php
new file mode 100644
index 0000000000000000000000000000000000000000..8245ae24bb16e1b8c72a811635b132844ceeb8ce
--- /dev/null
+++ b/modules/sanitycheck/hooks/hook_frontpage.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Hook to add the modinfo module to the frontpage.
+ *
+ * @param array &$links  The links on the frontpage, split into sections.
+ */
+function sanitycheck_hook_frontpage(&$links) {
+	assert('is_array($links)');
+	assert('array_key_exists("links", $links)');
+
+	$links['links'][] = array(
+		'href' => SimpleSAML_Module::getModuleURL('sanitycheck/index.php'),
+		'text' => array('en' => 'Sanity check of your simpleSAMLphp setup'),
+	);
+
+}
+?>
\ No newline at end of file
diff --git a/modules/sanitycheck/hooks/hook_sanitycheck.php b/modules/sanitycheck/hooks/hook_sanitycheck.php
new file mode 100644
index 0000000000000000000000000000000000000000..8349777662196c1ac0c5b784c213d2c9cc20a0a8
--- /dev/null
+++ b/modules/sanitycheck/hooks/hook_sanitycheck.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Hook to add the modinfo module to the frontpage.
+ *
+ * @param array &$hookinfo  hookinfo
+ */
+function sanitycheck_hook_sanitycheck(&$hookinfo) {
+	assert('is_array($hookinfo)');
+	assert('array_key_exists("errors", $hookinfo)');
+	assert('array_key_exists("info", $hookinfo)');
+
+	$hookinfo['info'][] = '[sanitycheck] At least the sanity check it self is working :)';
+	
+	$hookinfo['errors'][] = '[sanitycheck] At least the sanity check it self is working (NOT) :)';
+	
+}
+?>
\ No newline at end of file
diff --git a/modules/sanitycheck/templates/default/check-tpl.php b/modules/sanitycheck/templates/default/check-tpl.php
new file mode 100644
index 0000000000000000000000000000000000000000..f167b47879754050a10430066c4cdb9bb6e7f711
--- /dev/null
+++ b/modules/sanitycheck/templates/default/check-tpl.php
@@ -0,0 +1,49 @@
+<?php
+$this->data['header'] = 'Sanity check';
+$this->includeAtTemplateBase('includes/header.php');
+
+?>
+<div id="content">
+
+<h2><?php echo($this->data['header']); ?></h2>
+
+<?php
+if (count($this->data['errors']) > 0) {
+?>
+<div style="border: 1px solid #800; background: #caa; margin: 1em; padding: .5em">
+<p><?php echo '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/delete.png" alt="Failed" />'; ?>	
+These checks failed:</p>
+<?php
+
+	echo '<ul>';
+	foreach ($this->data['errors'] AS $err) {
+		echo '<li>' . $err . '</li>';
+	}
+	echo '</ul>';
+
+echo '</div>';
+}
+?>
+
+<?php
+if (count($this->data['info']) > 0) {
+?>
+<div style="border: 1px solid #ccc; background: #eee; margin: 1em; padding: .5em">
+<p><?php echo '<img src="/' . $this->data['baseurlpath'] . 'resources/icons/accept.png" alt="OK" />'; ?>	
+These checks succeeded:</p>
+<?php
+	echo '<ul>';
+	foreach ($this->data['info'] AS $i) {
+		echo '<li>' . $i . '</li>';
+	}
+	echo '</ul>';
+
+
+echo '</div>';
+}
+?>
+
+
+</div>
+
+<?php $this->includeAtTemplateBase('includes/footer.php'); ?>
\ No newline at end of file
diff --git a/modules/sanitycheck/www/index.php b/modules/sanitycheck/www/index.php
new file mode 100644
index 0000000000000000000000000000000000000000..7d86a2dab339c9dcf13dafbe383bde10dd292f04
--- /dev/null
+++ b/modules/sanitycheck/www/index.php
@@ -0,0 +1,25 @@
+<?php
+
+
+$config = SimpleSAML_Configuration::getInstance();
+$sconfig = $config->copyFromBase('sconfig', 'config-sanitycheck.php');
+
+
+
+
+$info = array();
+$errors = array();
+$hookinfo = array(
+	'info' => &$info, 
+	'errors' => &$errors,
+);
+SimpleSAML_Module::callHooks('sanitycheck', $hookinfo);
+
+
+$config = SimpleSAML_Configuration::getInstance();
+$t = new SimpleSAML_XHTML_Template($config, 'sanitycheck:check-tpl.php');
+$t->data['errors'] = $errors;
+$t->data['info'] = $info;
+$t->show();
+
+?>
\ No newline at end of file