7 files changed, 10 insertions, 4 deletions
diff --git a/_config.yml b/_config.yml
index 1df1331..39e6a7b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,9 +1,9 @@
-permalink: "/:year/:month/:day/:title"
+permalink: "/:year/:month/:day/:title/"
 exclude: ["README.markdown"]
 lsi: false
 safe: true
 
-baseurl: ""
+baseurl: "/irssi.github.io"
 url: "http://irssi.github.io"
 
 title: Irssi
@@ -18,3 +18,4 @@ paginate_path: "news/:num/"
 collections:
   articles:
     output: true
+    permalink: "/articles/:title/"
diff --git a/_includes/header.html b/_includes/header.html
index 61ed5e2..dfe0a4d 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -7,14 +7,14 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="{{ site.baseurl }}">
+            <a class="navbar-brand" href="{{ site.baseurl }}/">
                 <img alt="Irssi Logo" class="navbar-irssi-logo" src="{{ site.baseurl }}/assets/logo.png">
                 {% comment %}{{ site.title }}{% endcomment %}
             </a>
         </div>
         <div id="navbar" class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
-                <li{% if page.url == "/index.html" %} class="active"{% endif %}><a href="{{ site.baseurl }}">News</a></li>
+                <li{% if page.url == "/index.html" %} class="active"{% endif %}><a href="{{ site.baseurl }}/">News</a></li>
                 {% comment %}
                     Exclude the news feed and the paginated news pages.
                 {% endcomment %}
diff --git a/about/index.markdown b/about/index.markdown
index e04b107..aaff8ae 100644
--- a/about/index.markdown
+++ b/about/index.markdown
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: About Irssi
+permalink: about/
 ---
 
 Introduction
diff --git a/articles/index.markdown b/articles/index.markdown
index 252470f..29f81c3 100644
--- a/articles/index.markdown
+++ b/articles/index.markdown
@@ -1,6 +1,7 @@
 ---
 layout: default
 title: Articles
+permalink: articles/
 ---
 
 Articles
diff --git a/support/index.markdown b/support/index.markdown
index 416f51d..9bae485 100644
--- a/support/index.markdown
+++ b/support/index.markdown
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Support
+permalink: support/
 ---
 
 - [Mailing lists](mailinglists)
diff --git a/support/irc/index.markdown b/support/irc/index.markdown
index fa6cf93..8769d2d 100644
--- a/support/irc/index.markdown
+++ b/support/irc/index.markdown
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: IRC
+permalink: support/irc/
 ---
 
 Official international channels
diff --git a/support/mailinglists/index.markdown b/support/mailinglists/index.markdown
index 6abbc96..d8fdc89 100644
--- a/support/mailinglists/index.markdown
+++ b/support/mailinglists/index.markdown
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Mailing lists
+permalink: support/mailinglists/
 ---
 
 irssi-users