diff --git a/calendar/inc/hook_admin.inc.php b/calendar/inc/hook_admin.inc.php
index 5fcd039703..2c13952d20 100755
--- a/calendar/inc/hook_admin.inc.php
+++ b/calendar/inc/hook_admin.inc.php
@@ -15,6 +15,7 @@
 // Only Modify the $file and $title variables.....
 	$title = $appname;
 	$file = Array(
+		'Site Configuration' => $phpgw->link('/admin/config.php','appname=' . $appname),
 		'Calendar Holiday Management'		=> $phpgw->link('/calendar/holiday_admin.php')
 	);
 //Do not modify below this line
diff --git a/calendar/templates/default/config.tpl b/calendar/templates/default/config.tpl
new file mode 100644
index 0000000000..92dbc88aa4
--- /dev/null
+++ b/calendar/templates/default/config.tpl
@@ -0,0 +1,51 @@
+<!-- BEGIN header -->
+<form method="POST" action="{action_url}">
+<table border="0" align="center">
+   <tr bgcolor="{th_bg}">
+    <td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
+   </tr>
+<!-- END header -->
+
+<!-- BEGIN body -->
+   <tr bgcolor="{row_on}">
+    <td colspan="2">&nbsp;</td>
+   </tr>
+
+   <tr bgcolor="{row_off}">
+    <td colspan="2"><b>{lang_Calendar_settings}</b></td>
+   </tr>
+   <tr bgcolor="{row_on}">
+    <td>{lang_Do_you_wish_to_autoload_calendar_holidays_files_dynamically?}</td>
+    <td>
+     <select name="newsettings[auto_load_holidays]">
+      <option value=""{selected_auto_load_holidays_False}>{lang_No}</option>
+      <option value="True"{selected_auto_load_holidays_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+   <tr bgcolor="{row_off}">
+    <td>{lang_Location_to_autoload_from}:</td>
+    <td>
+     <select name="newsettings[holidays_url_path]">
+      <option value="localhost"{selected_holidays_url_path_localhost}>localhost</option>
+      <option value="http://www.phpgroupware.org/cal"{selected_holidays_url_path_http://www.phpgroupware.org/cal}>www.phpgroupware.org</option>
+     </select>
+    </td>
+   </tr>
+<!-- END body -->
+
+<!-- BEGIN footer -->
+  <tr bgcolor="{th_bg}">
+    <td colspan="2">
+&nbsp;
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2" align="center">
+      <input type="submit" name="submit" value="Submit">
+      <input type="submit" name="cancel" value="Cancel">
+    </td>
+  </tr>
+</table>
+</form>
+<!-- END footer -->