diff --git a/syte/templates/base.html b/syte/templates/base.html
index 2ea24af..9e2e52e 100644
--- a/syte/templates/base.html
+++ b/syte/templates/base.html
@@ -9,7 +9,7 @@
   <!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
 {% assets filters="cssmin", output="css/styles.min.css", "css/styles.css", "css/pygments.css" %}
-    <link rel="stylesheet" href="{{ ASSET_URL }}">
+    <link rel="stylesheet" href="{{ SITE_URL }}/{{ ASSET_URL }}">
 {% endassets %}
 
   <link rel="shortcut icon" type="image/png" href="{{ GRAVATAR }}" />
@@ -61,7 +61,7 @@
 </div>
 
 {% assets filters="rjsmin", output="gen/packed.js", "js/libs/jquery-1.7.2.min.js", "js/libs/jquery.url.js", "js/libs/bootstrap-modal.js", "js/libs/handlebars.js", "js/libs/spin.min.js", "js/libs/moment.min.js", "js/common.js", "js/libs/github.js", "js/libs/google+.js", "js/libs/twitter.js", "js/libs/instagram.js" %}
-    <script src="{{ ASSET_URL }}"></script>
+<script src="{{ SITE_URL }}/{{ ASSET_URL }}"></script>
 {% endassets %}
 
 <script>
@@ -100,4 +100,5 @@
 </script>
 
 {% include "analytics.html" %}
+{% include "piwik.html" %}
 </body>
diff --git a/syte/templates/piwik.html b/syte/templates/piwik.html
new file mode 100644
index 0000000..08eba22
--- /dev/null
+++ b/syte/templates/piwik.html
@@ -0,0 +1,16 @@
+{% if PIWIK_URL and PIWIK_SITE_ID %}
+<script type="text/javascript">
+{% if PIWIK_SSL_URL %}
+	var pkBaseURL = (("https:" == document.location.protocol) ? "https://{{ PIWIK_SSL_URL }}/" : "http://{{ PIWIK_URL }}/");
+{% else %}
+	var pkBaseURL = (("http:" == document.location.protocol) ? "http://{{ PIWIK_URL }}/" : "http://{{ PIWIK_URL }}/");
+{% endif %}
+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_ID }});
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://{{ PIWIK_URL }}/piwik.php?idsite={{ PIWIK_SITE_ID }}" style="border:0" alt="" /></p></noscript>
+{% endif %}