diff --git a/docs/src/site/markdown/privacy-policy.md b/docs/src/site/markdown/privacy-policy.md
deleted file mode 100644
index dbcd29fc1b..0000000000
--- a/docs/src/site/markdown/privacy-policy.md
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<head><title>Privacy Policy</title></head>
-
-Privacy Policy
---------------
-
-Information about your use of this website is collected using server
-access logs and a tracking cookie. The collected information consists of
-the following:
-
-1.  The IP address from which you access the website;
-
-2.  The type of browser and operating system you use to access our site;
-
-3.  The date and time you access our site;
-
-4.  The pages you visit; and
-
-5.  The addresses of pages from where you followed a link to our site.
-
-Part of this information is gathered using a tracking cookie set by the
-[Google Analytics](https://www.google.com/analytics/) service and handled
-by Google as described in their [privacy
-policy](https://www.google.com/privacy.html). See your browser
-documentation for instructions on how to disable the cookie if you
-prefer not to share this data with Google.
-
-We use the gathered information to help us make our site more useful to
-visitors and to better understand how and when our site is used. We do
-not track or collect personally identifiable information or associate
-gathered data with any personally identifying information from other
-sources.
-
-By using this website, you consent to the collection of this data in the
-manner and for the purpose described above.
-
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 84fba95304..979ea8ef06 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -56,23 +56,23 @@
 
   <body>
     <head>
-       <!-- Start of Google analytics 
-       <script type="text/javascript">
-         var _gaq = _gaq || [];
-         _gaq.push(['_setAccount', '']);
-         _gaq.push(['_trackPageview']);
-
-         (function() {
-            var ga = document.createElement('script'); 
-            ga.type = 'text/javascript'; ga.async = true;
-            ga.src = ('https:' == document.location.protocol ? 
-                      'https://ssl' : 'http://www') + 
-                     '.google-analytics.com/ga.js';
-            var s = document.getElementsByTagName('script')[0]; 
-            s.parentNode.insertBefore(ga, s);
-          })();
-       </script>
-       End of Google analytics -->
+      <!-- Matomo -->
+      <script>
+        var _paq = window._paq = window._paq || [];
+        /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+        _paq.push(["setDoNotTrack", true]);
+        _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', '63']);
+          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>
+      <!-- End Matomo Code -->
        <style>
            .well.sidebar-nav {
              background-color: #fff;
@@ -155,7 +155,7 @@
       </div>
       <br/>
       <div class="row span12">
-        <a href="privacy-policy.html">Privacy Policy</a>
+        <a href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy Policy</a>
       </div>
     </footer>
 
