diff --git a/piwik/templates/piwik/tracking_code.html b/piwik/templates/piwik/tracking_code.html
index ab36f07..cf3e2ec 100644
--- a/piwik/templates/piwik/tracking_code.html
+++ b/piwik/templates/piwik/tracking_code.html
@@ -1,12 +1,17 @@
-<!-- Piwik --> 
+<!-- Start Piwik Tracking Code -->
 <script type="text/javascript">
-  var pkBaseURL = "{{ url }}";
-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", {{ id }});
-piwikTracker.trackPageView();
-piwikTracker.enableLinkTracking();
-} catch( err ) {}
-</script><noscript><p><img src="{{ url }}piwik.php?idsite={{ id }}" style="border:0" alt="" /></p></noscript>
-<!-- End Piwik Tracking Code -->
+ try {
+    var _paq = _paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u=  "{{ url }}";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', '{{ 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+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+  } catch( err ) {}
+</script>
+</script><noscript><img src="{{ url }}piwik.php?idsite={{ id }}&rec=1" style="border:0" alt="" /></noscript>
+<!-- End Piwik Tracking Code -->
\ No newline at end of file