diff --git a/_layouts/plugin.html b/_layouts/plugin.html
index ce0394aa..3edf81f6 100644
--- a/_layouts/plugin.html
+++ b/_layouts/plugin.html
@@ -71,7 +71,7 @@ fullwith: true
           <h4 class="plugin_links">Categories</h4>
           <div>
             {% for categorie in page.categories %}
-            <a href="/categories/#{{ categorie | slugify }}"><span class="plugin_cat">{{ categorie }}</span></a>
+            <a href="{% link categories.html %}#{{ categorie | slugify }}"><span class="plugin_cat">{{ categorie }}</span></a>
             {% endfor %}
           </div>
         </div>
@@ -80,7 +80,7 @@ fullwith: true
           <h4 class="plugin_links">Tags</h4>
           <div>
             {% for tag in page.tags %}
-            <a href="/tags/#{{ tag | slugify }}"><span class="plugin_tag">{{ tag }}</span></a>
+            <a href="{% link tags.html %}#{{ tag | slugify }}"><span class="plugin_tag">{{ tag }}</span></a>
             {% endfor %}
           </div>
         </div>
diff --git a/categories.html b/categories.html
index 342ba09b..3a250014 100644
--- a/categories.html
+++ b/categories.html
@@ -2,6 +2,6 @@
 layout: collection/collection_refpage
 title: Plugins by Category
 collection: repo
-permalink: /categories/
+permalink: /plugins/categories/
 reference: categories
 ---
diff --git a/tags.html b/tags.html
index 6d4e13a6..85273a96 100644
--- a/tags.html
+++ b/tags.html
@@ -2,6 +2,6 @@
 layout: collection/collection_refpage
 title: Plugins by Tags
 collection: repo
-permalink: /tags/
+permalink: /plugins/tags/
 reference: tags
 ---