diff --git a/plugins/dot2svg.py b/plugins/dot2svg.py
index d27e3f4e..e2483b23 100644
--- a/plugins/dot2svg.py
+++ b/plugins/dot2svg.py
@@ -43,11 +43,21 @@
 _class_src = re.compile(r"""<g id="(edge|node|clust)\d+" class="(?P<type>edge|node|cluster)(?P<classes>[^"]*)">
 <title>(?P<title>[^<]*)</title>
 <(?P<element>ellipse|polygon|path|text)( fill="(?P<fill>[^"]+)" stroke="[^"]+")? """)
-
 _class_dst = r"""<g class="{classes}">
 <title>{title}</title>
 <{element} """
 
+# Nodes that are links have an additional group containing a link inside. Again
+# Graphviz < 2.40 (Ubuntu 16.04 and older) doesn't have a linebreak between <g>
+# and <title>.
+_class_with_link_inside_src = re.compile(r"""<g id="(edge|node)\d+" class="(?P<type>edge|node)(?P<classes>[^"]*)">[\n]?<title>(?P<title>[^<]*)</title>
+<g id="a_(edge|node)\d+"><a (?P<link>[^>]+)>
+<(?P<element>ellipse|polygon|path) fill="(?P<fill>[^"]+)" stroke="[^"]+" """)
+_class_with_link_inside_dst = r"""<g class="{classes}">
+<title>{title}</title>
+<g><a {link}>
+<{element} """
+
 _attributes_src = re.compile(r"""<(?P<element>ellipse|polygon|polyline) fill="[^"]+" stroke="[^"]+" """)
 
 _attributes_dst = r"""<\g<element> """
@@ -111,6 +121,20 @@ def element_repl(match):
             element=match.group('element'))
     svg = _class_src.sub(element_repl, svg)
 
+    # Links have additional group around, second pass with a different regex
+    def element_link_repl(match):
+        classes = ['m-' + match.group('type')] + match.group('classes').replace('&#45;', '-').split()
+        # distinguish between solid and filled nodes
+        if match.group('type') == 'node' and match.group('fill') == 'none':
+            classes += ['m-flat']
+
+        return _class_with_link_inside_dst.format(
+            link=match.group('link'),
+            classes=' '.join(classes),
+            title=match.group('title'),
+            element=match.group('element'))
+    svg = _class_with_link_inside_src.sub(element_link_repl, svg)
+
     # Remove unnecessary fill and stroke attributes
     svg = _attributes_src.sub(_attributes_dst, svg)
 
diff --git a/plugins/m/test/dot/page-240.html b/plugins/m/test/dot/page-240.html
index 3f14d8db..c1004158 100644
--- a/plugins/m/test/dot/page-240.html
+++ b/plugins/m/test/dot/page-240.html
@@ -211,6 +211,42 @@ <h1>m.dot</h1>
 </g>
 </svg>
 </div>
+<p>Links:</p>
+<div class="m-graph">
+<svg style="width: 10.438rem; height: 8.500rem;" viewBox="0.00 0.00 167.40 135.54">
+<g transform="scale(1 1) rotate(0) translate(4 131.5391)">
+<g class="m-node m-primary">
+<title>A</title>
+<g><a xlink:href="#" xlink:title="link to #">
+<ellipse cx="59.397" cy="-109.1543" rx="59.2941" ry="18.2703"/>
+<text text-anchor="middle" x="59.397" y="-105.3543">link to #</text>
+</a>
+</g>
+</g>
+<g class="m-node m-success m-flat">
+<title>B</title>
+<g><a xlink:href="#" xlink:title="link to /">
+<ellipse cx="59.397" cy="-18.3848" rx="53.9813" ry="18.2703"/>
+<text text-anchor="middle" x="59.397" y="-14.5848">link to /</text>
+</a>
+</g>
+</g>
+<g class="m-edge m-warning">
+<title>A&#45;&gt;B</title>
+<g><a xlink:href="http://mcss.mosra.cz/" xlink:title="link to m.css">
+<path d="M59.397,-90.3468C59.397,-77.8501 59.397,-61.2025 59.397,-47.0671"/>
+<polygon points="62.8971,-46.8576 59.397,-36.8576 55.8971,-46.8577 62.8971,-46.8576"/>
+</a>
+</g>
+<g id="a_edge1&#45;label"><a xlink:href="http://mcss.mosra.cz/" xlink:title="link to m.css">
+<text text-anchor="middle" x="109.397" y="-59.9696">link to m.css</text>
+</a>
+</g>
+</g>
+</g>
+</svg>
+</div>
+<p>Figures:</p>
 <figure class="m-figure">
 <svg class="m-graph m-info" style="width: 3.875rem; height: 7.375rem;" viewBox="0.00 0.00 62.00 117.54">
 <g transform="scale(1 1) rotate(0) translate(4 113.5391)">
diff --git a/plugins/m/test/dot/page.rst b/plugins/m/test/dot/page.rst
index 0d997dfe..ae7a30a3 100644
--- a/plugins/m/test/dot/page.rst
+++ b/plugins/m/test/dot/page.rst
@@ -59,6 +59,17 @@ Structs:
 
     another [label="a | { b | c } | d | e" shape=record]
 
+Links:
+
+.. digraph::
+
+    A [label="link to #" URL="#" style=filled class="m-primary"]
+    B [label="link to /" URL="#" class="m-success"]
+
+    A -> B [label="link to m.css" URL="http://mcss.mosra.cz/" class="m-warning"]
+
+Figures:
+
 .. graph-figure:: This is a title.
 
     .. digraph:: A to B