diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index 116dbd811a..81f6063c7b 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -326,6 +326,7 @@
 			DelayedMessageAdmins("MOTD file [motd_file] didn't exist")
 
 	motd = motd_contents.Join("\n")
+	motd = GLOB.is_valid_url.Replace(motd, span_linkify("$1"))
 
 	var/tm_info = GLOB.revdata.GetTestMergeInfo()
 	if(motd || tm_info)
diff --git a/config/example/motd.txt b/config/example/motd.txt
index 622fdafcbe..76972e4f2e 100644
--- a/config/example/motd.txt
+++ b/config/example/motd.txt
@@ -1,5 +1,5 @@
 <h1>Welcome to Space Station 13!</h1>
 
--<i>This server is running the <a href="https://ss13polaris.com/">Polaris</a> modification of the <a href="https://baystation12.net/">Baystation12</a> SS13 code.</i>
+-<i>This server is running the https://ss13polaris.com modification of the https://baystation12.net SS13 code.</i>
 <br><br>
-<strong>Bugtracker:</strong> <a href="https://github.com/PolarisSS13/Polaris/issues">for posting of bugs and issues.</a>
+<strong>Bugtracker:</strong> https://github.com/PolarisSS13/Polaris/issues for posting of bugs and issues.</a>