diff --git a/xsl/gemini.xsl b/xsl/gemini.xsl
index 0a9d116dd..df89aacae 100644
--- a/xsl/gemini.xsl
+++ b/xsl/gemini.xsl
@@ -15,26 +15,45 @@
 
     <text>## Navigation&#10;</text>
     <for-each select="document('../content/navigation.xml')/navigation/group">
-      <for-each select="file">
-        <text>=&gt; </text>
-        <value-of select="concat($baseurl, ., '.gmi')"/>
-        <text> </text>
-        <choose>
-          <when test="string-length(@title) = 0">
-            <value-of select="document(concat('../content/pages/', ., '.xml'))/page/@title"/>
-          </when>
-          <otherwise>
-            <value-of select="@title"/>
-          </otherwise>
-        </choose>
-        <text>&#10;</text>
-      </for-each>
+      <apply-templates mode="navitem" select="child::*"/>
+      <text>&#10;</text>
     </for-each>
-    <text>&#10;</text>
 
     <call-template name="body"/>
   </template>
 
+  <template mode="navitem" match="file">
+    <text>=&gt; </text>
+    <value-of select="concat($baseurl, ., '.gmi')"/>
+    <text> </text>
+    <choose>
+      <when test="string-length(@title) = 0">
+        <value-of select="document(concat('../content/pages/', ., '.xml'))/page/@title"/>
+      </when>
+      <otherwise>
+        <value-of select="@title"/>
+      </otherwise>
+    </choose>
+    <text>&#10;</text>
+  </template>
+
+  <template mode="navitem" match="link">
+    <text>=> </text>
+    <call-template name="make-href">
+      <with-param name="href">
+        <choose>
+          <when test="@href"><value-of select="@href"/></when>
+          <otherwise><value-of select="."/></otherwise>
+        </choose>
+      </with-param>
+    </call-template>
+    <text> </text>
+    <call-template name="normalize-paragraph">
+      <with-param name="text" select="normalize-space(.)"/>
+    </call-template>
+    <text>&#10;</text>
+  </template>
+
   <template match="/page[@pagetitle]">
     <text># </text><value-of select="@pagetitle"/><text> | c3d2.de&#10;</text>