diff --git a/boot.php b/boot.php
index 61deae18b7..b06c2d0bf4 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1215' );
+define ( 'FRIENDICA_VERSION',      '2.3.1216' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1115      );
 
diff --git a/include/items.php b/include/items.php
index a63468d925..0bd77582a5 100644
--- a/include/items.php
+++ b/include/items.php
@@ -945,10 +945,15 @@ function tgroup_deliver($uid,$item_id) {
 
 	$link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
 
+	// Diaspora uses their own hardwired link URL in @-tags
+	// instead of the one we supply with webfinger
+
+	$dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
+
 	$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
 	if($cnt) {
 		foreach($matches as $mtch) {
-			if(link_compare($link,$mtch[1])) {
+			if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
 				$deliver_to_tgroup = true;
 				logger('tgroup_deliver: local group mention found: ' . $mtch[2]);
 			}