diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 86b5d04dfe..9a5b008b25 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -13,6 +13,7 @@ defaultContentLanguageInSubdir= true
   description = "Documentation for Hugo Learn Theme"
   author = "Mathieu Cornic"
   disableSearch = false # default to false
+  disableAssetBusting = false # default to false
   ordersectionsby = "weight" # ordersectionsby = "title"
 
 [outputs]
diff --git a/layouts/404.html b/layouts/404.html
index 18de1d167b..c27d4d0ba2 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -6,13 +6,13 @@
   <title>{{ .Scratch.Get "title" }}</title>
   {{ partial "style.html" . }}
   
-  <link href="{{"css/nucleus.css" | relLangURL}}" rel="stylesheet">
-  <link href="{{"css/font-awesome.min.css" | relLangURL}}" rel="stylesheet">
-  <link href="{{"css/hybrid.css" | relLangURL}}" rel="stylesheet">
-  <link href="{{"css/featherlight.min.css" | relLangURL}}" rel="stylesheet">
-  <link href="{{"css/perfect-scrollbar.min.css" | relLangURL}}" rel="stylesheet">
-  <link href="{{"css/theme.css" | relLangURL}}" rel="stylesheet">
-  <link href="{{"css/hugo-theme.css" | relLangURL}}" rel="stylesheet">
+  <link href="{{"css/nucleus.css" | relLangURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+  <link href="{{"css/font-awesome.min.css" | relLangURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+  <link href="{{"css/hybrid.css" | relLangURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+  <link href="{{"css/featherlight.min.css" | relLangURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+  <link href="{{"css/perfect-scrollbar.min.css" | relLangURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+  <link href="{{"css/theme.css" | relLangURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+  <link href="{{"css/hugo-theme.css" | relLangURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
   <style type="text/css">
     :root #header + #content > #left > #rlblock_left {
       display: none !important;
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 7a168195c5..4b7e66dd4a 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -52,20 +52,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="{{"js/clipboard.min.js" | relURL}}"></script>
-    <script src="{{"js/perfect-scrollbar.min.js" | relURL}}"></script>
-    <script src="{{"js/perfect-scrollbar.jquery.min.js" | relURL}}"></script>
-    <script src="{{"js/jquery.sticky-kit.min.js" | relURL}}"></script>
-    <script src="{{"js/featherlight.min.js" | relURL}}"></script>
-    <script src="{{"js/html5shiv-printshiv.min.js" | relURL}}"></script>
-    <script src="{{"js/highlight.pack.js" | relURL}}"></script>
+    <script src="{{"js/clipboard.min.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/perfect-scrollbar.min.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/perfect-scrollbar.jquery.min.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/jquery.sticky-kit.min.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/featherlight.min.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/html5shiv-printshiv.min.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/highlight.pack.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="{{"js/modernizr.custom.71422.js" | relURL}}"></script>
-    <script src="{{"js/learn.js" | relURL}}"></script>
-    <script src="{{"js/hugo-learn.js" | relURL}}"></script>
+    <script src="{{"js/modernizr.custom.71422.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/learn.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/hugo-learn.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
 
-    <link href="{{"mermaid/mermaid.css" | relURL}}" type="text/css" rel="stylesheet" />
-    <script src="{{"mermaid/mermaid.js" | relURL}}"></script>
+    <link href="{{"mermaid/mermaid.css" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" type="text/css" rel="stylesheet" />
+    <script src="{{"mermaid/mermaid.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index cf1cf652ee..11017d771f 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -8,15 +8,15 @@
     {{ partial "favicon.html" . }}
     <title>{{ .Title }} :: {{ .Site.Title }}</title>
     
-    <link href="{{"css/nucleus.css" | relURL}}" rel="stylesheet">
-    <link href="{{"css/font-awesome.min.css" | relURL}}" rel="stylesheet">
-    <link href="{{"css/hybrid.css" | relURL}}" rel="stylesheet">
-    <link href="{{"css/featherlight.min.css" | relURL}}" rel="stylesheet">
-    <link href="{{"css/perfect-scrollbar.min.css" | relURL}}" rel="stylesheet">
-    <link href="{{"css/horsey.css" | relURL}}" rel="stylesheet">
-    <link href="{{"css/theme.css" | relURL}}" rel="stylesheet">
-    <link href="{{"css/hugo-theme.css" | relURL}}" rel="stylesheet">
-    <script src="{{"js/jquery-2.x.min.js"| relURL}}"></script>
+    <link href="{{"css/nucleus.css" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/font-awesome.min.css" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/hybrid.css" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/featherlight.min.css" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/perfect-scrollbar.min.css" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/horsey.css" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/theme.css" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <link href="{{"css/hugo-theme.css" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+    <script src="{{"js/jquery-2.x.min.js"| relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
 
     <style type="text/css">
       :root #header + #content > #left > #rlblock_left{