diff --git a/README.md b/README.md
index 2d09475..f471ed6 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ The [old branch](https://github.com/frjo/hugo-theme-zen/tree/old) has the origin
 ## Features
 
 * A mobile menu
-* Analytics with Piwik
+* Analytics with Matamo (Piwik)
 * Automatic linting of css and js
 * Contact form (PHP)
 * CSS grid and flex for layout
@@ -88,8 +88,8 @@ params:
   logo: false               # Turn off the logo.
   microUsername: ""         # Your micro.blog username.
   mobileMenu: true          # Turn on a mobile menu on small screens.
-  piwikSiteId:              # Piwik site id
-  piwikTrackerUrl: ""       # Piwik url, schemaless and no slash on end (example.com/piwik).
+  piwikSiteId:              # Matamo site id
+  piwikTrackerUrl: ""       # Matamo url, schemaless and no slash on end (example.com/matamo).
   poweredby: true           # Show powered by hugo in footer
   search: true              # Site search with DuckDuckGo.
   searchSize: 20            # Search field size, default 20.
diff --git a/layouts/partials/piwik.html b/layouts/partials/piwik.html
index 97d6f27..a929e38 100644
--- a/layouts/partials/piwik.html
+++ b/layouts/partials/piwik.html
@@ -1,3 +1,4 @@
+<!-- Matomo -->
 <script type="text/javascript">
   var _paq = _paq || [];
   _paq.push(['trackPageView']);
@@ -10,3 +11,4 @@
     g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
+<!-- End Matomo Code -->
diff --git a/theme.toml b/theme.toml
index 4d94c70..2147265 100644
--- a/theme.toml
+++ b/theme.toml
@@ -4,7 +4,7 @@ homepage = "https://github.com/frjo/hugo-theme-zen"
 license = "GPLv2"
 licenselink = "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 tags = ["multilingual", "responsive", "blog", "search", "micro"]
-features = ["multilingual", "responsive", "grid", "sass", "gulp", "search", "piwik", "jsonfeed"]
+features = ["multilingual", "responsive", "grid", "sass", "gulp", "search", "matamo", "jsonfeed"]
 min_version = 0.28
 
 [author]