diff --git a/README.md b/README.md
index d37d109..b5e5b5f 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ The minimalist [Pelican](http://blog.getpelican.com/) theme.
 - [Google AdSense](https://www.google.com.br/adsense/start/) (new in 2.1.0)
 - [Google Analytics](https://www.google.com/analytics/web/)
 - [Google Tag Manager](https://www.google.com/tagmanager/)
-- [Matomo Analytics](https://matomo.org/)
+- [Matomo Analytics (formerly Piwik)](https://matomo.org/)
 - [StatusCake](https://www.statuscake.com/)
 
 ## Plugins Support
diff --git a/templates/base.html b/templates/base.html
index 38a0dc5..2425148 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -194,8 +194,8 @@
     <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid={{ ADD_THIS_ID }}" async="async"></script>
   {% endif %}
 
-  {% if PIWIK_URL and PIWIK_SITE_ID %}
-    {% include "partial/piwik.html" %}
+  {% if (PIWIK_URL and PIWIK_SITE_ID) or (MATOMO_URL and MATOMO_SITE_ID) %}
+    {% include "partial/matomo.html" %}
   {% endif %}
 
   {% include "partial/jsonld.html" %}
diff --git a/templates/partial/piwik.html b/templates/partial/matomo.html
similarity index 57%
rename from templates/partial/piwik.html
rename to templates/partial/matomo.html
index ee434d0..7fe966b 100644
--- a/templates/partial/piwik.html
+++ b/templates/partial/matomo.html
@@ -4,12 +4,12 @@
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   (function() {
-    var u="https://{{ MATOMO_URL }}/";
+    var u="https://{{ MATOMO_URL or  PIWIK_URL }}/";
     _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', {{ MATOMO_SITE_ID }}]);
+    _paq.push(['setSiteId', {{ MATOMO_SITE_ID or PIWIK_SITE_ID }}]);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
     g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
-<noscript><p><img src="https://{{ MATOMO_URL }}/matomo.php?idsite={{ MATOMO_SITE_ID }}&rec=1" style="border:0" alt="" /></p></noscript>
-<!-- End Matomo Code -->
\ No newline at end of file
+<noscript><p><img src="https://{{ MATOMO_URL or PIWIK_URL }}/matomo.php?idsite={{ MATOMO_SITE_ID or PIWIK_SITE_ID }}&rec=1" style="border:0" alt="" /></p></noscript>
+<!-- End Matomo Code -->