diff --git a/lib/diaspora_federation/federation/diaspora_url_parser.rb b/lib/diaspora_federation/federation/diaspora_url_parser.rb
index 0b7e2f0..5b59da2 100644
--- a/lib/diaspora_federation/federation/diaspora_url_parser.rb
+++ b/lib/diaspora_federation/federation/diaspora_url_parser.rb
@@ -6,7 +6,7 @@ module DiasporaFederation
 
       # Regex to find diaspora:// URLs
       DIASPORA_URL_REGEX = %r{
-        diaspora://
+        (?:web\+)?diaspora://
         (#{Validation::Rule::DiasporaId::DIASPORA_ID_REGEX})/
         (#{Entity::ENTITY_NAME_REGEX})/
         (#{Validation::Rule::Guid::VALID_CHARS})
diff --git a/spec/lib/diaspora_federation/federation/diaspora_url_parser_spec.rb b/spec/lib/diaspora_federation/federation/diaspora_url_parser_spec.rb
index 0bd5628..2649d80 100644
--- a/spec/lib/diaspora_federation/federation/diaspora_url_parser_spec.rb
+++ b/spec/lib/diaspora_federation/federation/diaspora_url_parser_spec.rb
@@ -34,6 +34,14 @@ module DiasporaFederation
         Federation::DiasporaUrlParser.fetch_linked_entities(text)
       end
 
+      it "handles a link with web+ prefix" do
+        expect_callback(:fetch_related_entity, "Post", guid).and_return(double)
+
+        text = "This is a link with a `web+` prefix web+diaspora://#{author}/post/#{guid}."
+
+        Federation::DiasporaUrlParser.fetch_linked_entities(text)
+      end
+
       it "handles unknown entities gracefully" do
         expect(DiasporaFederation.callbacks).not_to receive(:trigger)
 
@@ -64,5 +72,22 @@ module DiasporaFederation
         }.not_to raise_error
       end
     end
+
+    describe "::DIASPORA_URL_REGEX" do
+      it "matches a diaspora URL inside normal text" do
+        text = "This is a link to a post diaspora://#{author}/post/#{guid}."
+        expect(text[Federation::DiasporaUrlParser::DIASPORA_URL_REGEX]).to eq("diaspora://#{author}/post/#{guid}")
+      end
+
+      it "matches a diaspora URL inside markdown" do
+        text = "This is a [link to a post with markdown](diaspora://#{author}/post/#{guid})."
+        expect(text[Federation::DiasporaUrlParser::DIASPORA_URL_REGEX]).to eq("diaspora://#{author}/post/#{guid}")
+      end
+
+      it "matches a web+diaspora URL" do
+        text = "This is a link with a `web+` prefix web+diaspora://#{author}/post/#{guid}."
+        expect(text[Federation::DiasporaUrlParser::DIASPORA_URL_REGEX]).to eq("web+diaspora://#{author}/post/#{guid}")
+      end
+    end
   end
 end