diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index f0a48d6c86..5f3af1c16b 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -2610,7 +2610,7 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
 
 	// echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
 
-	$time_adj = time() + (get_option( 'gmt_offset' ) * 3600 );
+	$time_adj = current_time('timestamp');
 	$post_date = ($for_post) ? $post->post_date : $comment->comment_date;
 	$jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
 	$mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 8405c510bd..b3c0f01175 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -1123,7 +1123,7 @@ function get_calendar($initial = true) {
 			echo "\n\t</tr>\n\t<tr>\n\t\t";
 		$newrow = false;
 
-		if ( $day == gmdate('j', (time() + (get_option('gmt_offset') * 3600))) && $thismonth == gmdate('m', time()+(get_option('gmt_offset') * 3600)) && $thisyear == gmdate('Y', time()+(get_option('gmt_offset') * 3600)) )
+		if ( $day == gmdate('j', current_time('timestamp')) && $thismonth == gmdate('m', current_time('timestamp')) && $thisyear == gmdate('Y', current_time('timestamp')) )
 			echo '<td id="today">';
 		else
 			echo '<td>';
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index bd9e6dc961..83e3a998bc 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -289,7 +289,7 @@ function get_attachment_link($id = false) {
 function get_year_link($year) {
 	global $wp_rewrite;
 	if ( !$year )
-		$year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
+		$year = gmdate('Y', current_time('timestamp'));
 	$yearlink = $wp_rewrite->get_year_permastruct();
 	if ( !empty($yearlink) ) {
 		$yearlink = str_replace('%year%', $year, $yearlink);
@@ -311,9 +311,9 @@ function get_year_link($year) {
 function get_month_link($year, $month) {
 	global $wp_rewrite;
 	if ( !$year )
-		$year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
+		$year = gmdate('Y', current_time('timestamp'));
 	if ( !$month )
-		$month = gmdate('m', time()+(get_option('gmt_offset') * 3600));
+		$month = gmdate('m', current_time('timestamp'));
 	$monthlink = $wp_rewrite->get_month_permastruct();
 	if ( !empty($monthlink) ) {
 		$monthlink = str_replace('%year%', $year, $monthlink);
@@ -337,11 +337,11 @@ function get_month_link($year, $month) {
 function get_day_link($year, $month, $day) {
 	global $wp_rewrite;
 	if ( !$year )
-		$year = gmdate('Y', time()+(get_option('gmt_offset') * 3600));
+		$year = gmdate('Y', current_time('timestamp'));
 	if ( !$month )
-		$month = gmdate('m', time()+(get_option('gmt_offset') * 3600));
+		$month = gmdate('m', current_time('timestamp'));
 	if ( !$day )
-		$day = gmdate('j', time()+(get_option('gmt_offset') * 3600));
+		$day = gmdate('j', current_time('timestamp'));
 
 	$daylink = $wp_rewrite->get_day_permastruct();
 	if ( !empty($daylink) ) {