diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 1c7a8867ee..03a14ff432 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -83,5 +83,6 @@ add_filter('the_author', 'ent2ncr', 8);
 
 // Actions
 add_action('publish_post', 'generic_ping');
+add_action('wp_head', 'rsd_link');
 
 ?>
\ No newline at end of file
diff --git a/wp-includes/template-functions-general.php b/wp-includes/template-functions-general.php
index 9f370e513e..c16fa057d5 100644
--- a/wp-includes/template-functions-general.php
+++ b/wp-includes/template-functions-general.php
@@ -653,4 +653,8 @@ function the_weekday_date($before='',$after='') {
 	echo $the_weekday_date;
 }
 
+function rsd_link() {
+	echo '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="' . get_bloginfo('url') . "/xmlrpc.php?rsd\" />\n";
+}
+
 ?>
\ No newline at end of file
diff --git a/xmlrpc.php b/xmlrpc.php
index b2176f323c..ff77a70b4d 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -4,6 +4,28 @@
 $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
 
 include('./wp-config.php');
+
+if ( isset( $_GET['rsd'] ) ) { // http://archipelago.phrasewise.com/rsd 
+header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
+
+?>
+<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
+<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
+  <service>
+    <engineName>WordPress</engineName>
+    <engineLink>http://wordpress.org/</engineLink>
+    <homePageLink><?php bloginfo_rss('url') ?></homePageLink>
+    <apis>
+      <api name="Movable Type" blogID="1" preferred="true" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
+      <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
+      <api name="Blogger" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('url') ?>/xmlrpc.php" />
+    </apis>
+  </service>
+</rsd>
+<?php
+exit;
+}
+
 include_once(ABSPATH . WPINC . '/class-IXR.php');
 
 // Turn off all warnings and errors.