Index: /mods/wpsg_mod_basic.class.php
===================================================================
--- /mods/wpsg_mod_basic.class.php	(revision 8302)
+++ /mods/wpsg_mod_basic.class.php	(revision 8303)
@@ -62,5 +62,4 @@
 			300 	=> 'wpsg_mod_export', // Exportprofile
 			440 	=> 'wpsg_mod_statistics', // Statistiken
-			450 	=> 'wpsg_mod_piwik', // Piwik
 			500 	=> 'wpsg_mod_freeshipping', // Versandkostenfrei
 			599		=> 'wpsg_mod_newsletter', // wpNewsletterGermany
Index: /mods/wpsg_mod_statistics.class.php
===================================================================
--- /mods/wpsg_mod_statistics.class.php	(revision 8302)
+++ /mods/wpsg_mod_statistics.class.php	(revision 8303)
@@ -254,5 +254,5 @@
 				<script type="text/javascript">
 					var pkBaseURL = (("https:" == document.location.protocol) ? "https://'.$url.'/" : "http://'.$url.'/");
-					document.write(unescape("%3Cscript src=\'" + pkBaseURL + "piwik.js\' type=\'text/javascript\'%3E%3C/script%3E"));
+					document.write(unescape("%3Cscript src=\'" + pkBaseURL + "matomo.js\' type=\'text/javascript\'%3E%3C/script%3E"));
 				</script>
 			';
@@ -261,4 +261,24 @@
 			{
 			
+				echo '
+					<!-- Piwik Tracking Code -->				
+					<script type="text/javascript">
+						try {
+					
+							var _paq = window._paq = window._paq || [];
+							_paq.push(["setTrackerUrl", pkBaseURL + "matomo.php"]);
+							_paq.push(["setSiteId", '.$this->shop->get_option('wpsg_mod_statistics_piwik_SiteId').']);
+							_paq.push(["trackPageView"]);
+							_paq.push(["enableLinkTracking"]);
+	
+						} catch(err) { }
+					</script>
+					<!-- End Piwik Tracking Code -->
+				';
+				
+			}
+			else
+			{
+				
 				echo '
 					<!-- Piwik Tracking Code -->				
@@ -266,23 +286,7 @@
 						try {
 						
-							var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", '.$this->shop->get_option('wpsg_mod_statistics_piwik_SiteId').');
-							piwikTracker.trackPageView();
-							piwikTracker.enableLinkTracking();
-	
-						} catch(err) { }
-					</script>
-					<!-- End Piwik Tracking Code -->
-				';
-				
-			}
-			else
-			{
-				
-				echo '
-					<!-- Piwik Tracking Code -->				
-					<script type="text/javascript">
-						try {
-						
-							var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", '.$this->shop->get_option('wpsg_mod_statistics_piwik_SiteId').');
+							var _paq = window._paq = window._paq || [];
+							_paq.push(["setTrackerUrl", pkBaseURL + "matomo.php"]);
+							_paq.push(["setSiteId", '.$this->shop->get_option('wpsg_mod_statistics_piwik_SiteId').']);
 	
 						} catch(err) { }
Index: /system/conf.php
===================================================================
--- /system/conf.php	(revision 8302)
+++ /system/conf.php	(revision 8303)
@@ -32,5 +32,4 @@
 		"mod_spconditions", "wpsg_mod_spconditions.class.php", "wpsg_mod_spconditions",
 		"mod_customermap", "wpsg_mod_customermap.class.php",
-		"mod_piwik", "wpsg_mod_piwik.class.php",
 		"mod_produktartikel", "wpsg_mod_produktartikel.class.php",
 		"mod_cab", "wpsg_mod_cab.class.php",