diff --git a/admin/calendar.php b/admin/calendar.php
new file mode 100644
index 00000000..31cc7162
--- /dev/null
+++ b/admin/calendar.php
@@ -0,0 +1,77 @@
+<?php
+/*******************************************************************************
+ *  Title: Help Desk Software HESK
+ *  Version: 2.6.5 from 28th August 2015
+ *  Author: Klemen Stirn
+ *  Website: http://www.hesk.com
+ ********************************************************************************
+ *  COPYRIGHT AND TRADEMARK NOTICE
+ *  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
+ *  HESK is a registered trademark of Klemen Stirn.
+ *  The HESK may be used and modified free of charge by anyone
+ *  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
+ *  By using this code you agree to indemnify Klemen Stirn from any
+ *  liability that might arise from it's use.
+ *  Selling the code for this program, in part or full, without prior
+ *  written consent is expressly forbidden.
+ *  Using this code, in part or full, to create derivate work,
+ *  new scripts or products is expressly forbidden. Obtain permission
+ *  before redistributing this software over the Internet or in
+ *  any other medium. In all cases copyright and header must remain intact.
+ *  This Copyright is in full effect in any country that has International
+ *  Trade Agreements with the United States of America or
+ *  with the European Union.
+ *  Removing any of the copyright notices without purchasing a license
+ *  is expressly forbidden. To remove HESK copyright notice you must purchase
+ *  a license for this script. For more information on how to obtain
+ *  a license please visit the page below:
+ *  https://www.hesk.com/buy.php
+ *******************************************************************************/
+
+define('IN_SCRIPT', 1);
+define('HESK_PATH', '../');
+define('PAGE_TITLE', 'ADMIN_TOOLS');
+
+/* Get all the required files and functions */
+require(HESK_PATH . 'hesk_settings.inc.php');
+require(HESK_PATH . 'inc/common.inc.php');
+require(HESK_PATH . 'inc/admin_functions.inc.php');
+hesk_load_database_functions();
+
+hesk_session_start();
+hesk_dbConnect();
+hesk_isLoggedIn();
+
+/* Check permissions for this feature */
+//hesk_checkPermission('can_service_msg');
+
+// Define required constants
+define('MFH_CALENDAR', 1);
+
+/* Print header */
+require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
+
+/* Print main manage users page */
+require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+?>
+
+<div class="row pad-20">
+    <div class="col-lg-12">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h4>Calendar</h4>
+            </div>
+            <div class="panel-body">
+                <div id="calendar"></div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<?php
+
+require_once(HESK_PATH . 'inc/footer.inc.php');
+exit();
+
+
+/*** START FUNCTIONS ***/
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 65eac2df..9df818ca 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -77,6 +77,7 @@ $modsForHesk_settings = mfh_getSettings();
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/dropzone.min.css">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/dropzone-basic.min.css">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/fullcalendar.min.css">
     <script src="<?php echo HESK_PATH; ?>js/jquery-1.10.2.min.js"></script>
     <script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>hesk_javascript.js"></script>
     <script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap.min.js"></script>
@@ -214,6 +215,12 @@ $modsForHesk_settings = mfh_getSettings();
             $onload .= "ss();";
         }
     }
+
+    if (defined('MFH_CALENDAR')) { ?>
+        <script src="<?php echo HESK_PATH; ?>js/calendar/moment.js"></script>
+        <script src="<?php echo HESK_PATH; ?>js/calendar/fullcalendar.min.js"></script>
+        <script src="<?php echo HESK_PATH; ?>js/calendar/mods-for-hesk-calendar.js"></script>
+    <?php }
     ?>
 
 </head>
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
new file mode 100644
index 00000000..38cf6c72
--- /dev/null
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -0,0 +1,11 @@
+$(document).ready(function() {
+    $('#calendar').fullCalendar({
+        header: {
+            left: 'prev,next today',
+            center: 'title',
+            right: 'month,agendaWeek,agendaDay'
+        },
+        editable: true,
+        eventLimit: true
+    });
+});
\ No newline at end of file