diff --git a/mod/acctlink.php b/mod/acctlink.php
deleted file mode 100644
index fb8cfd400..000000000
--- a/mod/acctlink.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-use Friendica\App;
-use Friendica\Network\Probe;
-
-function acctlink_init()
-{
-	if (x($_GET, 'addr')) {
-		$addr = trim($_GET['addr']);
-		$res = Probe::uri($addr);
-		if ($res['url']) {
-			goaway($res['url']);
-			killme();
-		}
-	}
-}
diff --git a/src/Module/Acctlink.php b/src/Module/Acctlink.php
new file mode 100644
index 000000000..f14905277
--- /dev/null
+++ b/src/Module/Acctlink.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Network\Probe;
+
+/**
+ * Redirects to another URL based on the parameter 'addr'
+ */
+class Acctlink extends BaseModule
+{
+	public static function content()
+	{
+		$addr = defaults($_REQUEST, 'addr', false);
+
+		if ($addr) {
+			$url = defaults(Probe::uri($addr), 'url', false);
+
+			if ($url) {
+				goaway($url);
+				exit();
+			}
+		}
+	}
+}