diff --git a/mod/rsd_xml.php b/mod/rsd_xml.php
deleted file mode 100644
index 84dedd6c5..000000000
--- a/mod/rsd_xml.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-use Friendica\App;
-use Friendica\Core\System;
-
-function rsd_xml_content(App $a)
-{
-	header ("Content-Type: text/xml");
-	echo '<?xml version="1.0" encoding="UTF-8"?>
-<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
-  <service>
-    <engineName>Friendica</engineName>
-    <engineLink>http://friendica.com/</engineLink>
-    <apis>
-      <api name="Twitter" preferred="true" apiLink="'.System::baseUrl().'/api/" blogID="">
-        <settings>
-          <docs>http://status.net/wiki/TwitterCompatibleAPI</docs>
-          <setting name="OAuth">false</setting>
-        </settings>
-      </api>
-    </apis>
-  </service>
-</rsd>';
-
-	exit();
-}
diff --git a/src/App/Router.php b/src/App/Router.php
index b94c0bb58..1dffb6b40 100644
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -164,6 +164,7 @@ class Router
 			$collector->addRoute(['GET'], '/{sub1}/{sub2}/{url}'               , Module\Proxy::class);
 		});
 		$this->routeCollector->addRoute(['GET', 'POST'], '/register',            Module\Register::class);
+		$this->routeCollector->addRoute(['GET'],         '/rsd.xml',             Module\ReallySimpleDiscovery::class);
 		$this->routeCollector->addRoute(['GET'],         '/statistics.json',     Module\Statistics::class);
 		$this->routeCollector->addRoute(['GET'],         '/tos',                 Module\Tos::class);
 		$this->routeCollector->addRoute(['GET'],         '/webfinger',           Module\WebFinger::class);
diff --git a/src/Module/ReallySimpleDiscovery.php b/src/Module/ReallySimpleDiscovery.php
new file mode 100644
index 000000000..4c14d3c83
--- /dev/null
+++ b/src/Module/ReallySimpleDiscovery.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\Renderer;
+
+/**
+ * Prints the rsd.xml
+ * @see http://danielberlinger.github.io/rsd/
+ */
+class ReallySimpleDiscovery extends BaseModule
+{
+	public static function rawContent()
+	{
+		header ('Content-Type: text/xml');
+		$tpl = Renderer::getMarkupTemplate('rsd.tpl');
+		echo Renderer::replaceMacros($tpl);
+		exit();
+	}
+}
diff --git a/view/templates/rsd.tpl b/view/templates/rsd.tpl
new file mode 100644
index 000000000..c194e8f26
--- /dev/null
+++ b/view/templates/rsd.tpl
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
+	<service>
+		<engineName>Friendica</engineName>
+		<engineLink>http://friendica.com/</engineLink>
+		<apis>
+			<api name="Twitter" preferred="true" apiLink="{{$baseurl}}/api/" blogID="">
+				<settings>
+					<docs>http://status.net/wiki/TwitterCompatibleAPI</docs>
+					<setting name="OAuth">false</setting>
+				</settings>
+			</api>
+		</apis>
+	</service>
+</rsd>