diff --git a/_includes/panel.html b/_includes/panel.html
index e8502dd..d6ae271 100644
--- a/_includes/panel.html
+++ b/_includes/panel.html
@@ -27,7 +27,7 @@
         {% assign post = site.posts | where: "url", post_url | first %}
 
         {% if post %}
-          {% assign url = post.url | prepend: site.baseurl %}
+          {% assign url = post.url | relative_url %}
 
           <li><a href="{{ url }}">{{ post.title }}</a></li>
 
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 6deb037..50a74d9 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -21,7 +21,7 @@
 
     <div class="profile-text mt-3">
       <div id="site-title">
-        <a href="{{ site.baseurl }}/">{{- site.title -}}</a>
+        <a href="{{ '/' | relative_url }}">{{- site.title -}}</a>
       </div>
       <div id="site-subtitle" class="font-italic">{{- site.tagline -}}</div>
     </div>
diff --git a/_layouts/category.html b/_layouts/category.html
index 1259311..a53aff5 100644
--- a/_layouts/category.html
+++ b/_layouts/category.html
@@ -16,7 +16,7 @@ layout: page
   <ul class="post-content pl-0">
     {% for post in site.categories[page.category] %}
     <li class="d-flex justify-content-between pl-md-3 pr-md-3">
-      <a href="{{ post.url | absolute_url }}">{{ post.title }}</a>
+      <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
       <span class="dash flex-grow-1"></span>
       <span class="text-muted small">{{ post.date | date: site.data.date_format.post }}</span>
     </li>
diff --git a/_layouts/home.html b/_layouts/home.html
index f549c17..0f4edbe 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -11,7 +11,7 @@ layout: page
   {% for post in paginator.posts %}
   <div class="post-preview">
     <h1>
-      <a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a>
+      <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
     </h1>
     <div class="post-content">
       <p>
diff --git a/_layouts/tag.html b/_layouts/tag.html
index 527f16f..f90ec33 100644
--- a/_layouts/tag.html
+++ b/_layouts/tag.html
@@ -16,7 +16,7 @@ layout: page
   <ul class="post-content pl-0">
     {% for post in site.tags[page.tag] %}
     <li class="d-flex justify-content-between pl-md-3 pr-md-3">
-      <a href="{{ post.url | absolute_url }}">{{ post.title }}</a>
+      <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
       <span class="dash flex-grow-1"></span>
       <span class="text-muted small">{{ post.date | date: site.data.date_format.post }}</span>
     </li>
diff --git a/tabs/archives.md b/tabs/archives.md
index 8d5508c..b7a2d90 100644
--- a/tabs/archives.md
+++ b/tabs/archives.md
@@ -24,7 +24,7 @@ title: Archives
         {% capture this_month %}{{ post.date | date: "%b" }}{% endcapture %}
         <span class="date day">{{ this_day }}</span>
         <span class="date month small text-muted">{{ this_month }}</span>
-        <a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a>
+        <a href="{{ post.url | relative_url }}">{{ post.title }}</a>
       </div>
     </li>
   {% if forloop.last %}