diff --git a/include/items.php b/include/items.php
index 0445c4490..c2c4c1029 100644
--- a/include/items.php
+++ b/include/items.php
@@ -280,6 +280,10 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
 
 	$URLSearchString = "^\[\]";
 
+	// Fix for Mastodon where the mentions are in a different format
+	$body = preg_replace("/\[url\=([$URLSearchString]*)\]([#!@])(.*?)\[\/url\]/ism",
+				'$2[url=$1]$3[/url]', $body);
+
 	// Adding these spaces is a quick hack due to my problems with regular expressions :)
 	preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " ".$body, $matches);
 
diff --git a/include/socgraph.php b/include/socgraph.php
index 421a68cc9..765ed5d89 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -391,6 +391,15 @@ function poco_detect_server($profile) {
 		}
 	}
 
+	// Mastodon
+	if ($server_url == "") {
+		$red = preg_replace("=(https?://)(.*)/users/(.*)=ism", "$1$2", $profile);
+		if ($red != $profile) {
+			$server_url = $red;
+			$network = NETWORK_OSTATUS;
+		}
+	}
+
 	return $server_url;
 }
 
@@ -755,6 +764,13 @@ function poco_check_server($server_url, $network = "", $force = false) {
 						$versionparts = explode("-", $version);
 						$version = $versionparts[0];
 					}
+
+					if(stristr($line,'Server: Mastodon')) {
+						$platform = "Mastodon";
+						$network = NETWORK_OSTATUS;
+						// Mastodon doesn't reveal version numbers
+						$version = "";
+					}
 				}
 		}
 	}