diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 62e639e..c7aa8d1 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -12,7 +12,7 @@
                     {{ with .Params.tags }}
                     {{ if ge (len .) 1 }}
                         {{ range . }}
-                            <a href="{{ $.Site.BaseURL }}tags/{{ . | urlize }}">{{ . }}</a>
+                            <a href="{{ $.Site.BaseURL }}/tags/{{ . | urlize }}">{{ . }}</a>
                         {{ end }}
                     {{ end }}
                     {{ end}}
@@ -24,7 +24,7 @@
             </article>
             <footer id="post-meta" class="clearfix">
                 {{ with .Site.Params.twitter }}<a href="https://twitter.com/{{ . }}">{{ end }}
-                        <img class="avatar" src="{{ .Site.BaseURL }}images/avatar.png">
+                        <img class="avatar" src="{{ .Site.BaseURL }}/images/avatar.png">
                         <div>
                             <span class="dark">{{ .Site.Params.name }}</span>
                             <span>{{ .Site.Params.aboutAuthor }}</span>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index a6269a6..ea0a02e 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -8,7 +8,7 @@
         {{ else }}
             © Copyright {{ now.Format "2006"}} {{ .Site.Params.name }}
         {{ end }}
-        | <a href="{{ .Site.BaseURL }}imprint">Impressum</a>
+        | <a href="{{ .Site.BaseURL }}/imprint">Impressum</a>
 
     </p>
 </footer>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index a283657..6af8c1f 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -8,11 +8,12 @@
         {{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }}
         {{ .Hugo.Generator }}
         <title>{{ if .IsHome }}{{ .Title }}{{ else }}{{ .Title }} &middot; {{ .Site.Title }}{{ end }}</title>
-        <link rel="shortcut icon" href="{{ .Site.BaseURL }}images/favicon.ico">
-        {{ $style := resources.Get "css/style.css" | resources.Minify | resources.Fingerprint }}
+        <link rel="shortcut icon" href="{{ .Site.BaseURL }}/images/favicon.ico">
+        {{ $css := resources.Get "css/style.css" }}
+        {{ $style :=  $css | resources.Minify | resources.Fingerprint }}
         <link rel="stylesheet" href="{{ $style.Permalink }}">
         {{ range .Site.Params.customCSS }}
-        <link rel="stylesheet" href="{{ $.Site.BaseURL }}{{ . }}">
+        <link rel="stylesheet" href="{{ $.Site.BaseURL }}/{{ . }}">
         {{ end }}
 
         {{ if .Site.Params.enableRSS }}
diff --git a/layouts/partials/js.html b/layouts/partials/js.html
index 721150e..a62497b 100644
--- a/layouts/partials/js.html
+++ b/layouts/partials/js.html
@@ -1,5 +1,5 @@
 {{ range .Site.Params.customJS }}
-<script src="{{ $.Site.BaseURL }}{{ . }}"></script>
+<script src="{{ $.Site.BaseURL }}/{{ . }}"></script>
 {{ end }}
 
 {{ with .Site.Params.Piwik }}
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index 1716e92..3dd7512 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -5,10 +5,10 @@
 	{{ end }}
 
 	{{ if ne $url "about/" }}
-		<a href='{{ .Site.BaseURL }}about'>{{ with .Site.Params.about }}{{ . }}{{ else }}About{{ end }}</a>
+		<a href='{{ .Site.BaseURL }}/about'>{{ with .Site.Params.about }}{{ . }}{{ else }}About{{ end }}</a>
 	{{ end }}
 
 	{{ if .Site.Params.enableRSS }}
 	<a class="cta" href="{{ .Site.RSSLink }}">{{ with .Site.Params.subscribe }}{{ . }}{{ else }}Subscribe{{ end }}</a>
 	{{ end }}
-</nav>
\ No newline at end of file
+</nav>
diff --git a/layouts/partials/profile.html b/layouts/partials/profile.html
index d58f285..56d5ab7 100644
--- a/layouts/partials/profile.html
+++ b/layouts/partials/profile.html
@@ -1,11 +1,11 @@
 <div class="profile">
     <section id="wrapper">
         <header id="header">
-            <a href='{{ .Site.BaseURL }}about'>
-                <img id="avatar" class="2x" src="{{ .Site.BaseURL }}images/avatar.png"/>
+            <a href='{{ .Site.BaseURL }}/about'>
+                <img id="avatar" class="2x" src="{{ .Site.BaseURL }}/images/avatar.png"/>
             </a>
             <h1>{{ .Site.Params.name }}</h1>
             <h2>{{ .Site.Params.bio | markdownify }}</h2>
         </header>
     </section>
-</div>
\ No newline at end of file
+</div>