diff --git a/modules/markup/html.go b/modules/markup/html.go
index c13ebab98a..7961c5c930 100644
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -69,6 +69,10 @@ var (
 	//   https://html.spec.whatwg.org/multipage/input.html#e-mail-state-(type%3Demail)
 	emailRegex = regexp.MustCompile("(?:\\s|^|\\(|\\[)([a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9]{2,}(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+)(?:\\s|$|\\)|\\]|;|,|\\?|!|\\.(\\s|$))")
 
+	// Fediverse handle regex (same as emailRegex but with additonal @ or !
+	// at start)
+	fediRegex = regexp.MustCompile("(?:\\s|^|\\(|\\[)([@!]([a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+)@([a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9]{2,}(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+))(?:\\s|$|\\)|\\]|;|,|\\?|!|\\.(\\s|$))")
+
 	// blackfriday extensions create IDs like fn:user-content-footnote
 	blackfridayExtRegex = regexp.MustCompile(`[^:]*:user-content-`)
 
@@ -153,6 +157,7 @@ var defaultProcessors = []processor{
 	issueIndexPatternProcessor,
 	commitCrossReferencePatternProcessor,
 	hashCurrentPatternProcessor,
+	fediAddressProcessor,
 	emailAddressProcessor,
 	emojiProcessor,
 	emojiShortCodeProcessor,
@@ -1237,6 +1242,21 @@ func hashCurrentPatternProcessor(ctx *RenderContext, node *html.Node) {
 	}
 }
 
+// fediAddressProcessor replaces raw fediverse handles with toolforge links
+func fediAddressProcessor(ctx *RenderContext, node *html.Node) {
+	next := node.NextSibling
+	for node != nil && node != next {
+		m := fediRegex.FindStringSubmatchIndex(node.Data)
+		if m == nil {
+			return
+		}
+
+		fedihandle := node.Data[m[2]:m[3]]
+		replaceContent(node, m[2], m[3], createLink("https://fedirect.toolforge.org/?id="+url.QueryEscape(fedihandle), fedihandle, "fedihandle"))
+		node = node.NextSibling.NextSibling
+	}
+}
+
 // emailAddressProcessor replaces raw email addresses with a mailto: link.
 func emailAddressProcessor(ctx *RenderContext, node *html.Node) {
 	next := node.NextSibling
diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go
index 9d0c40c9e8..2bc929bb04 100644
--- a/modules/markup/html_test.go
+++ b/modules/markup/html_test.go
@@ -307,6 +307,19 @@ func TestRender_email(t *testing.T) {
 	test(
 		"email@domain..com",
 		`<p>email@domain..com</p>`)
+
+	// Test fediverse handle
+	test(
+		"@forgejo@floss.social",
+		`<p><a href="https://fedirect.toolforge.org/?id=%40forgejo%40floss.social" rel="nofollow">@forgejo@floss.social</a></p>`)
+
+	test(
+		"!forgejo@programming.dev",
+		`<p><a href="https://fedirect.toolforge.org/?id=%21forgejo%40programming.dev" rel="nofollow">!forgejo@programming.dev</a></p>`)
+
+	test(
+		"@#&@forgejo.org",
+		`<p><a href="https://fedirect.toolforge.org/?id=%40%23%26%40forgejo.org" rel="nofollow">@#&amp;@forgejo.org</a></p>`)
 }
 
 func TestRender_emoji(t *testing.T) {