diff --git a/wp-app.php b/wp-app.php
index 889a63b442..0ada250e3a 100644
--- a/wp-app.php
+++ b/wp-app.php
@@ -1189,8 +1189,8 @@ EOD;
 	</app:control>
 	<author>
 		<name><?php the_author()?></name>
-<?php if (get_the_author_url() && get_the_author_url() != 'http://') { ?>
-		<uri><?php the_author_url()?></uri>
+<?php if ( get_the_author_meta('url') && get_the_author_meta('url') != 'http://' ) { ?>
+		<uri><?php the_author_meta('url') ?></uri>
 <?php } ?>
 	</author>
 <?php if($GLOBALS['post']->post_type == 'attachment') { ?>
diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php
index 71a1dc570a..f7d64f9bec 100644
--- a/wp-includes/author-template.php
+++ b/wp-includes/author-template.php
@@ -127,12 +127,12 @@ function the_author_meta($field = '', $user_id = false) {
  *
  * @link http://codex.wordpress.org/Template_Tags/the_author_link
  * @since 2.1
- * @uses get_the_author_url()
+ * @uses get_the_author_meta()
  * @uses the_author()
  */
 function the_author_link() {
-	if (get_the_author_url()) {
-		echo '<a href="' . get_the_author_url() . '" title="' . sprintf(__("Visit %s&#8217;s website"), get_the_author()) . '" rel="external">' . get_the_author() . '</a>';
+	if ( get_the_author_meta('url') ) {
+		echo '<a href="' . get_the_author_meta('url') . '" title="' . sprintf(__("Visit %s&#8217;s website"), get_the_author()) . '" rel="external">' . get_the_author() . '</a>';
 	} else {
 		the_author();
 	}
diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index dad299129d..17b7833b7a 100644
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -31,8 +31,8 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 	<entry>
 		<author>
 			<name><?php the_author() ?></name>
-			<?php $author_url = get_the_author_url(); if ( !empty($author_url) ) : ?>
-			<uri><?php the_author_url()?></uri>
+			<?php $author_url = get_the_author_meta('url'); if ( !empty($author_url) ) : ?>
+			<uri><?php the_author_meta('url')?></uri>
 			<?php endif; ?>
 		</author>
 		<title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title>