diff --git a/apps/calendar/ajax/guesstimezone.php b/apps/calendar/ajax/guesstimezone.php
new file mode 100755
index 0000000000000000000000000000000000000000..a3594498b0f32749706d9ed51f083406d18b3bea
--- /dev/null
+++ b/apps/calendar/ajax/guesstimezone.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+function make_array_out_of_xml ($xml){
+	$returnarray = array();
+	$xml = (array)$xml ;
+	foreach ($xml as $property => $value){
+		$value = (array)$value;
+		if(!isset($value[0])){
+			$returnarray[$property] = make_array_out_of_xml($value);
+		}else{
+			$returnarray[$property] = trim($value[0]);
+		}
+	}
+	return $returnarray;
+}
+require_once ("../../../lib/base.php");
+OC_JSON::checkLoggedIn();
+OC_JSON::checkAppEnabled('calendar');
+$l = new OC_L10N('calendar');
+$lat = $_GET['lat'];
+$long = $_GET['long'];
+$geolocation = file_get_contents('http://ws.geonames.org/timezone?lat=' . $lat . '&lng=' . $long);
+//Information are by Geonames (http://www.geonames.org) and licensed under the Creative Commons Attribution 3.0 License
+$geoxml = simplexml_load_string($geolocation);
+$geoarray = make_array_out_of_xml($geoxml);
+if(isset($geoarray['timezone']['timezoneId']) && $geoarray['timezone']['timezoneId'] != ''){
+	OC_Preferences::setValue(OC_USER::getUser(), 'calendar', 'timezone', $geoarray['timezone']['timezoneId']);
+	$message = array('message'=> $l->t('New Timezone:') . $geoarray['timezone']['timezoneId']);
+	OC_JSON::success($message);
+}else{
+	OC_JSON::error();
+}
+
+?>
\ No newline at end of file
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index e5326d26e970ee324e7122c32a1f114d12098c7c..3313750d52e20ab41b36666473a67ad8f9c30ebc 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -32,6 +32,9 @@ if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'mont
 
 OC_Util::addScript('3rdparty/fullcalendar', 'fullcalendar');
 OC_Util::addStyle('3rdparty/fullcalendar', 'fullcalendar');
+if(OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone") == null){
+	OC_UTIL::addScript('calendar', 'geo');
+}
 OC_Util::addScript('calendar', 'calendar');
 OC_Util::addStyle('calendar', 'style');
 OC_Util::addScript('', 'jquery.multiselect');
@@ -39,4 +42,4 @@ OC_Util::addStyle('', 'jquery.multiselect');
 OC_App::setActiveNavigationEntry('calendar_index');
 $tmpl = new OC_Template('calendar', 'calendar', 'user');
 $tmpl->assign('eventSources', $eventSources);
-$tmpl->printPage();
+$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/js/geo.js b/apps/calendar/js/geo.js
new file mode 100755
index 0000000000000000000000000000000000000000..acea17c02690f9e58557fb5716928301dc91fb2e
--- /dev/null
+++ b/apps/calendar/js/geo.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+if (navigator.geolocation) { 
+	navigator.geolocation.getCurrentPosition(function(position) {
+		$.getJSON(OC.filePath('calendar', 'ajax', 'guesstimezone.php?lat=' + position.coords.latitude + '&long=' + position.coords.longitude + ''),
+		function(data){
+			if (data.status == 'success'){
+				$('#notification').html(data.message);
+				$('#notification').slideDown();
+				window.setTimeout(function(){$('#notification').slideUp();}, 5000);
+			}else{
+				console.log('Can\'t set new timezone.');
+			}
+		});
+	});
+}
\ No newline at end of file
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
old mode 100644
new mode 100755
index 0a6a7008fc1f92fc8e29b5fb3a8767081406701f..6654568f5ad8f535f1752040e7203bf9e66753dc
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -1,21 +1,21 @@
-<script type='text/javascript'>
-var defaultView = '<?php echo OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') ?>';
-var eventSources = <?php echo json_encode($_['eventSources']) ?>;
-var dayNames = <?php echo json_encode($l->tA(array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'))) ?>;
-var dayNamesShort = <?php echo json_encode($l->tA(array('Sun.', 'Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.'))) ?>;
-var monthNames = <?php echo json_encode($l->tA(array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'))) ?>;
-var monthNamesShort = <?php echo json_encode($l->tA(array('Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'))) ?>;
-var allDayText = '<?php echo $l->t('All day') ?>';
-var missing_field = '<?php echo $l->t('Missing fields') ?>';
-var missing_field_title = '<?php echo $l->t('Title') ?>';
-var missing_field_calendar = '<?php echo $l->t('Calendar') ?>';
-var missing_field_fromdate = '<?php echo $l->t('From Date') ?>';
-var missing_field_fromtime = '<?php echo $l->t('From Time') ?>';
-var missing_field_todate = '<?php echo $l->t('To Date') ?>';
-var missing_field_totime = '<?php echo $l->t('To Time') ?>';
-var missing_field_startsbeforeends = '<?php echo $l->t('The event ends before it starts') ?>';
-var missing_field_dberror = '<?php echo $l->t('There was a database fail') ?>';
-</script>
+				<script type='text/javascript'>
+				var defaultView = '<?php echo OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') ?>';
+				var eventSources = <?php echo json_encode($_['eventSources']) ?>;
+				var dayNames = <?php echo json_encode($l->tA(array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'))) ?>;
+				var dayNamesShort = <?php echo json_encode($l->tA(array('Sun.', 'Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.'))) ?>;
+				var monthNames = <?php echo json_encode($l->tA(array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'))) ?>;
+				var monthNamesShort = <?php echo json_encode($l->tA(array('Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'))) ?>;
+				var allDayText = '<?php echo $l->t('All day') ?>';
+				var missing_field = '<?php echo $l->t('Missing fields') ?>';
+				var missing_field_title = '<?php echo $l->t('Title') ?>';
+				var missing_field_calendar = '<?php echo $l->t('Calendar') ?>';
+				var missing_field_fromdate = '<?php echo $l->t('From Date') ?>';
+				var missing_field_fromtime = '<?php echo $l->t('From Time') ?>';
+				var missing_field_todate = '<?php echo $l->t('To Date') ?>';
+				var missing_field_totime = '<?php echo $l->t('To Time') ?>';
+				var missing_field_startsbeforeends = '<?php echo $l->t('The event ends before it starts') ?>';
+				var missing_field_dberror = '<?php echo $l->t('There was a database fail') ?>';
+				</script>
 				<div id="controls">
 					<div>
 						<form>
@@ -40,6 +40,7 @@ var missing_field_dberror = '<?php echo $l->t('There was a database fail') ?>';
 						</form>
 					</div>
 				</div>
+				<div id="notification" style="display:none;"></div>
 				<div id="calendar_holder">
 				</div>
 				<!-- Dialogs -->