diff --git a/app/MetaGer.php b/app/MetaGer.php
index 664cf6b77d0c7ffe2de8d5ae296ef0be0e4ccb83..1e776909d47d53fde0b7e70cad42808c15e6b192 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -237,6 +237,9 @@ class MetaGer
         #Adgoal Implementation
         $this->results = $this->parseAdgoal($this->results);
 
+        #Amazon Affiliate (MetaGers tag ist: metager04-21)
+        $this->results = $this->parseAmazon($this->results);
+
         $counter   = 0;
         $firstRank = 0;
 
@@ -435,6 +438,34 @@ class MetaGer
 
         return $results;
     }
+    
+    public function parseAmazon($results)
+    {
+        $amazonTag = "metager04-21";
+        
+        foreach ($results as $result) {
+            $link = $result->anzeigeLink;
+            if (strpos($link, "http") !== 0) {
+                $link = "http://" . $link;
+            }
+            $info = parse_url($url);
+            if(isset($info["host"])){
+                $host = $info['host'];
+                if(strpos($host, "amazon") !== FALSE){
+                    # This is Probably an Amazon Link. We'll add our tag as get parameter
+                    if(isset($info["query"])){
+                        $info["query"] .= "&tag=metager04-21";
+                    }else{
+                        $info["query"] = "tag=metager04-21";
+                    }
+                }
+                $newurl = http_build_url($info);
+                $result->link = $newurl;
+                $result->partnershop = true;
+            }
+        }
+        return $results;
+    }
 
     public function authorize($key)
     {