diff --git a/patchwork/templatetags/syntax.py b/patchwork/templatetags/syntax.py
index 64773e5a..d5cf405b 100644
--- a/patchwork/templatetags/syntax.py
+++ b/patchwork/templatetags/syntax.py
@@ -47,6 +47,10 @@ def _compile(value):
_span = '%s'
+_comment_link_re = re.compile(r'(https|http|git|ftp)://[^<)\s]+', re.I)
+
+_link = '%s'
+
@register.filter
def patchsyntax(patch):
@@ -74,5 +78,8 @@ def commentsyntax(submission):
for r, cls in _comment_span_res:
content = r.sub(lambda x: _span % (cls, x.group(0)), content)
+ content = _comment_link_re.sub(
+ lambda x: _link % (x.group(0), x.group(0)), content
+ )
return mark_safe(content)