diff --git a/_includes/footer.html b/_includes/footer.html
index 7d313cb8d..d582b17fb 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -16,20 +16,4 @@
             of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.
         </p>
     </div>
-</div>
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  _paq.push(["disableCookies"]);
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.apache.org/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '42']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<noscript><p><img src="https://analytics.apache.org/matomo.php?idsite=42&amp;rec=1" style="border:0;" alt="" /></p></noscript>
-<!-- End Matomo Code -->
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/_includes/header.html b/_includes/header.html
index c1b674a41..ecc99ed8b 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -9,5 +9,6 @@
     <script src="/js/jquery.min.js"></script>
     <script src="/js/bootstrap.min.js"></script>
     <script src="/js/site.js"></script>
+    <script src="/js/analytics.js"></script>
     <link rel="alternate" type="application/rss+xml" title="ASF Logging Services" href="/feed.xml">
 </head>
diff --git a/js/analytics.js b/js/analytics.js
new file mode 100644
index 000000000..c7a817122
--- /dev/null
+++ b/js/analytics.js
@@ -0,0 +1,53 @@
+(function () {
+    // List of URLs that do not need any analytics code
+    const noAnalyticsUrls = [
+
+
+    ];
+
+    // List of URLs that need a special version of Matomo code for obsolete websites
+    const dormantUrls = [
+        'https://logging.apache.org/flume',
+        'https://logging.apache.org/chainsaw/2.x/',
+        'https://logging.apache.org/log4php',
+        'https://logging.apache.org/log4j/1.x/',
+        'https://logging.apache.org/log4j/extras/',
+        'https://logging.apache.org/log4php/'
+    ];
+
+    function isUrlInList(url, list) {
+        return list.includes(url);
+    }
+
+    const url = window.location.href;
+
+    if (isUrlInList(url, dormantUrls)) {
+        // Load Matomo code for obsolete websites
+        var _paq = window._paq = window._paq || [];
+        _paq.push(["disableCookies"]);
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        (function () {
+            var u = "https://analytics.apache.org/";
+            _paq.push(['setTrackerUrl', u + 'matomo.php']);
+            _paq.push(['setSiteId', '42']);
+            var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+            g.async = true; g.src = u + 'matomo.js'; s.parentNode.insertBefore(g, s);
+        })();
+    } else if (isUrlInList(url, noAnalyticsUrls)) {
+        // Do not load any analytics code
+        return
+    } else {
+        var _paq = window._paq = window._paq || [];
+        _paq.push(["disableCookies"]);
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        (function () {
+            var u = "https://analytics.apache.org/";
+            _paq.push(['setTrackerUrl', u + 'matomo.php']);
+            _paq.push(['setSiteId', '42']);
+            var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+            g.async = true; g.src = u + 'matomo.js'; s.parentNode.insertBefore(g, s);
+        })();
+    }
+})();