diff --git a/e107_plugins/metaweblog/e_header.php b/e107_plugins/metaweblog/e_header.php
new file mode 100644
index 000000000..cb0bc6015
--- /dev/null
+++ b/e107_plugins/metaweblog/e_header.php
@@ -0,0 +1,8 @@
+<?php
+
+if (!defined('e107_INIT')) { exit; }
+
+echo "<link rel=\"EditURI\" type=\"application/rsd+xml\" title=\"RSD\" href=\"".SITEURLBASE.e_PLUGIN_ABS."metaweblog/metaweblog.php?rsd\" />\n";
+
+
+?>
\ No newline at end of file
diff --git a/e107_plugins/metaweblog/metaweblog.php b/e107_plugins/metaweblog/metaweblog.php
index e0ea9aa9c..1bc197ff0 100644
--- a/e107_plugins/metaweblog/metaweblog.php
+++ b/e107_plugins/metaweblog/metaweblog.php
@@ -24,30 +24,37 @@ if (!e107::isInstalled('metaweblog'))
 	header("location:".e_BASE."index.php"); 
 }
 
+
+if((e_QUERY == 'rsd') || isset($_GET['rsd'])) // http://archipelago.phrasewise.com/rsd
+{ 
+	header('Content-Type: text/xml; charset=UTF-8', true);
+	echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+	<rsd version=\"1.0\" xmlns=\"http://archipelago.phrasewise.com/rsd\">
+	  <service>
+	    <engineName>e107</engineName>
+	    <engineLink>http://www.e107.org/</engineLink>
+	    <homePageLink>".SITEURL."</homePageLink>
+	    <apis>
+	      <api name=\"WordPress\" blogID=\"1\" preferred=\"true\" apiLink=\"".SITEURLBASE.e_PLUGIN_ABS."metaweblog/metaweblog.php\" />
+	      <api name=\"Movable Type\" blogID=\"1\" preferred=\"false\" apiLink=\"". SITEURLBASE.e_PLUGIN_ABS."metaweblog/metaweblog.php\" />
+	      <api name=\"MetaWeblog\" blogID=\"1\" preferred=\"false\" apiLink=\"". SITEURLBASE.e_PLUGIN_ABS."metaweblog/metaweblog.php\" />
+	      <api name=\"Blogger\" blogID=\"1\" preferred=\"false\" apiLink=\"". SITEURLBASE.e_PLUGIN_ABS."metaweblog/metaweblog.php\"  />
+	    </apis>
+	  </service>
+	</rsd>";
+	
+	exit;
+}
+
+
+
+
 // These three files are from the PHP-XMLRPC library.
 include (e_HANDLER.'xmlrpc/xmlrpc.inc');
 include (e_HANDLER.'xmlrpc/xmlrpcs.inc');
 include (e_HANDLER.'xmlrpc/xmlrpc_wrappers.inc');
 
-if ( isset( $_GET['rsd'] ) ) { // http://archipelago.phrasewise.com/rsd
-header('Content-Type: text/xml; charset=UTF-8', true);
-echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
-<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
-  <service>
-    <engineName>e107</engineName>
-    <engineLink>http://www.e107.org/</engineLink>
-    <homePageLink><?php echo SITEURL ?></homePageLink>
-    <apis>
-      <api name="WordPress" blogID="1" preferred="true" apiLink="<?php echo SITEURLBASE.e_PLUGIN_ABS.'metaweblog/metaweblog.php' ?>" />
-      <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php echo SITEURLBASE.e_PLUGIN_ABS.'metaweblog/metaweblog.php' ?>" />
-      <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php echo SITEURLBASE.e_PLUGIN_ABS.'metaweblog/metaweblog.php' ?>" />
-      <api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo SITEURLBASE.e_PLUGIN_ABS.'metaweblog/metaweblog.php' ?>" />
-    </apis>
-  </service>
-</rsd>
-<?php
-exit;
-}
+
 
 
 //general note: XMLRPC method functions parameters