diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 586f47b2d74..13cf6b06cc2 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -21,7 +21,7 @@ <h1>
       {% for node in pages_list %}
         {% if node.title != null %}
           {% if node.layout == "page" %}
-            <a class="sidebar-nav-item{% if page.url == node.url %} active{% endif %}" href="{{ node.url }}">{{ node.title }}</a>
+            <a class="sidebar-nav-item{% if page.url == node.url %} active{% endif %}" href="{{ site.baseurl }}{{ node.url }}">{{ node.title }}</a>
           {% endif %}
         {% endif %}
       {% endfor %}
diff --git a/_layouts/post.html b/_layouts/post.html
index 2a6c7c1d9d3..c027477605b 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -14,7 +14,7 @@ <h2>Related Posts</h2>
     {% for post in site.related_posts limit:3 %}
       <li>
         <h3>
-          <a href="{{ post.url }}">
+          <a href="{{ site.baseurl }}{{ post.url }}">
             {{ post.title }}
             <small>{{ post.date | date_to_string }}</small>
           </a>
diff --git a/atom.xml b/atom.xml
index 96c9681c00b..f0f6c978b2f 100644
--- a/atom.xml
+++ b/atom.xml
@@ -18,7 +18,7 @@ layout: null
  {% for post in site.posts %}
  <entry>
    <title>{{ post.title }}</title>
-   <link href="{{ site.url }}{{ post.url }}"/>
+   <link href="{{ site.url }}{{ site.baseurl }}{{ post.url }}"/>
    <updated>{{ post.date | date_to_xmlschema }}</updated>
    <id>{{ site.url }}{{ post.id }}</id>
    <content type="html">{{ post.content | xml_escape }}</content>
diff --git a/index.html b/index.html
index 743a0808990..fe093d17710 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
   {% for post in paginator.posts %}
   <div class="post">
     <h1 class="post-title">
-      <a href="{{ post.url }}">
+      <a href="{{ site.baseurl }}{{ post.url }}">
         {{ post.title }}
       </a>
     </h1>