diff --git a/layouts/404.html b/layouts/404.html
index 1fc6265e2a..f9270f05a2 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -48,8 +48,8 @@
           </p>
           <p>{{T "message-404"}}</p>
           <p></p>
-          <p><a href="{{.Site.BaseURL}}">{{T "Go-to-homepage"}}</a></p>
-          <p><img src="{{ .Site.BaseURL }}/images/gopher-404.jpg" style="width:50%"></img></p>
+          <p><a href='{{ "" | relURL }}'>{{T "Go-to-homepage"}}</a></p>
+          <p><img src='{{ "/images/gopher-404.jpg" | relURL }}' style="width:50%"></img></p>
         </div>
       </div>
 
diff --git a/layouts/partials/search.html b/layouts/partials/search.html
index 394846df90..bef3728585 100644
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@@ -8,9 +8,9 @@
 <script type="text/javascript" src="{{"js/auto-complete.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
 <script type="text/javascript">
     {{ if .Site.IsMultiLingual }}
-        var baseurl = "{{.Site.BaseURL}}{{.Site.LanguagePrefix}}";
+        var baseurl = "{{.Site.LanguagePrefix | relURL }}";
     {{ else }}
-        var baseurl = "{{.Site.BaseURL}}";
+        var baseurl = '{{ "" | relURL }}';
     {{ end }}
 </script>
 <script type="text/javascript" src="{{"js/search.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
diff --git a/layouts/shortcodes/attachments.html b/layouts/shortcodes/attachments.html
index 42780d0190..7796526882 100644
--- a/layouts/shortcodes/attachments.html
+++ b/layouts/shortcodes/attachments.html
@@ -14,7 +14,7 @@
 		{{if ($.Get "pattern")}}
 			{{if (findRE ($.Get "pattern") .Name)}}
 				<li>
-					<a href="{{ printf "%s/%s%s/%s" $.Site.BaseURL $fileDir ($.Scratch.Get "filesName") .Name }}" >
+					<a href="{{ (printf "%s%s/%s" $fileDir ($.Scratch.Get "filesName") .Name) | relURL }}" >
 						{{.Name}}
 					</a>
 					({{div .Size 1024 }} ko)
@@ -22,7 +22,7 @@
 			{{end}}
 		{{else}}
 			<li>
-				<a href="{{ printf "%s/%s%s/%s" $.Site.BaseURL $fileDir ($.Scratch.Get "filesName") .Name }}" >
+				<a href="{{ (printf "%s%s/%s" $fileDir ($.Scratch.Get "filesName") .Name) | relURL }}" >
 					{{.Name}}
 				</a>
 				({{div .Size 1024 }} ko)