diff --git a/app/views/layouts/_piwik.html.erb b/app/views/layouts/_piwik.html.erb
new file mode 100644
index 000000000..59017e0b7
--- /dev/null
+++ b/app/views/layouts/_piwik.html.erb
@@ -0,0 +1,12 @@
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://<%= PIWIK_LOCATION %>/" : "http://<%= PIWIK_LOCATION %>/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", <%= PIWIK_SITE %>);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://<%= PIWIK_LOCATION %>/piwik.php?idsite=<%= PIWIK_SITE %>" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 9cb6d3df0..9da2edf47 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -133,5 +133,8 @@
         </div>
       </center>
     </div>
+    <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
+    <%= render :partial => "layouts/piwik" %>
+    <% end -%>
   </body>
 </html>
diff --git a/config/example.application.yml b/config/example.application.yml
index abcd1ce41..f4a369487 100644
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -73,6 +73,9 @@ standard_settings: &standard_settings
   require_terms_seen: false
   # Whether to require users to agree to the CTs before editing
   require_terms_agreed: false
+  # Piwik details
+  #piwik_location: "piwik.openstreetmap.org"
+  #piwik_site: 1
 
 development:
   <<: *standard_settings