diff --git a/index.php b/index.php
index ff20194e2..27f1d6e46 100644
--- a/index.php
+++ b/index.php
@@ -36,7 +36,7 @@ require('./wp-blog-header.php');
 <?php the_date('','<h2>','</h2>'); ?>
 	
 <div class="post">
-	 <h3 class="storytitle" id="post-<?php the_ID(); ?>"><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h3>
+	 <h3 class="storytitle" id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h3>
 	<div class="meta"><?php _e("Filed under:"); ?> <?php the_category() ?> &#8212; <?php the_author() ?> @ <?php the_time() ?> <?php edit_post_link(); ?></div>
 	
 	<div class="storycontent">
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 5f6f9c0f2..7160b0663 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -248,7 +248,7 @@ switch($action) {
 			?>
 	<div id='preview' class='wrap'>
          <h2><?php _e('Post Preview (updated when post is saved)'); ?></h2>
-                                                                            <h3 class="storytitle" id="post-<?php the_ID(); ?>"><a href="<?php echo get_permalink() ?>" rel="bookmark" title="<?php printf(__("Permanent Link: %s"), the_title()); ?>"><?php the_title(); ?></a></h3>
+                                                                            <h3 class="storytitle" id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__("Permanent Link: %s"), the_title()); ?>"><?php the_title(); ?></a></h3>
                                                                                                                                                                                                                                                                                         <div class="meta"><?php printf(__("Filed under: %s"), the_category()); ?> &#8212; <?php the_author() ?> @ <?php the_time() ?> <?php edit_post_link(); ?></div>
 	
 	<div class="storycontent">
diff --git a/wp-includes/template-functions-links.php b/wp-includes/template-functions-links.php
index 76bcf215d..52e901825 100644
--- a/wp-includes/template-functions-links.php
+++ b/wp-includes/template-functions-links.php
@@ -1,5 +1,9 @@
 <?php
 
+function the_permalink() {
+	echo get_permalink();
+}
+
 function permalink_anchor($mode = 'id') {
     global $id, $post;
     switch(strtolower($mode)) {
diff --git a/wp-rss2.php b/wp-rss2.php
index db615f524..0dd06caf8 100644
--- a/wp-rss2.php
+++ b/wp-rss2.php
@@ -32,7 +32,7 @@ header('Content-type: application/rss+xml', true);
 		<comments><?php comments_link(); ?></comments>
 		<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', $post->post_date_gmt); ?></pubDate>
 		<?php the_category_rss() ?>
-		<guid><?php echo get_permalink($id); ?></guid>
+		<guid><?php the_permalink($id); ?></guid>
 <?php $more = 1; if (get_settings('rss_use_excerpt')) {
 ?>
 		<description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description>