diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index d0b6da4122..97c4c7f0af 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -1376,6 +1376,7 @@ class StoreCdpStore(StoreBase):
     drm_free_only = True
     headquarters = 'PL'
     formats = ['EPUB', 'MOBI', 'PDF']
+    affiliate = True
 
 class StoreChitankaStore(StoreBase):
     name = u'Моята библиотека'
diff --git a/src/calibre/gui2/store/stores/cdp_plugin.py b/src/calibre/gui2/store/stores/cdp_plugin.py
index e981337009..7796ad2321 100644
--- a/src/calibre/gui2/store/stores/cdp_plugin.py
+++ b/src/calibre/gui2/store/stores/cdp_plugin.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 3 # Needed for dynamic plugin loading
+store_version = 4 # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2013-2014, Tomasz Długosz <tomek3d@gmail.com>'
 __docformat__ = 'restructuredtext en'
 
 import urllib
+from base64 import b64encode
 from contextlib import closing
 
 from lxml import html
@@ -24,24 +25,30 @@ from calibre.gui2.store.web_store_dialog import WebStoreDialog
 class CdpStore(BasicStoreConfig, StorePlugin):
 
     def open(self, parent=None, detail_item=None, external=False):
+        aff_root = 'https://www.a4b-tracking.com/pl/stat-click-text-link/47/58/'
 
         url = 'https://cdp.pl/ksiazki'
 
+        aff_url = aff_root + str(b64encode(url))
+
+        detail_url = None
+        if detail_item:
+            detail_url = aff_root + str(b64encode(detail_item))
+
         if external or self.config.get('open_external', False):
-            open_url(QUrl(url_slash_cleaner(detail_item if detail_item else url)))
+            open_url(QUrl(url_slash_cleaner(detail_url if detail_url else aff_url)))
         else:
-            d = WebStoreDialog(self.gui, url, parent, detail_item if detail_item else url)
+            d = WebStoreDialog(self.gui, url, parent, detail_url if detail_url else aff_url)
             d.setWindowTitle(self.name)
             d.set_tags(self.config.get('tags', ''))
             d.exec_()
 
     def search(self, query, max_results=10, timeout=60):
-        page=1
 
         br = browser()
+        page=1
 
         counter = max_results
-
         while counter:
             with closing(br.open(u'https://cdp.pl/products/search?utf8=✓&keywords=' + urllib.quote_plus(query) + '&page=' + str(page), timeout=timeout)) as f:
                 doc = html.fromstring(f.read())