diff --git a/src/calibre/gui2/store/stores/chitanka_plugin.py b/src/calibre/gui2/store/stores/chitanka_plugin.py
new file mode 100644
index 0000000000..a384dbcfe4
--- /dev/null
+++ b/src/calibre/gui2/store/stores/chitanka_plugin.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, Alex Stanev <alex@stanev.org>'
+__docformat__ = 'restructuredtext en'
+
+import re
+import urllib
+from contextlib import closing
+
+from lxml import html
+
+from PyQt4.Qt import QUrl
+
+from calibre import browser, url_slash_cleaner
+from calibre.gui2 import open_url
+from calibre.gui2.store import StorePlugin
+from calibre.gui2.store.basic_config import BasicStoreConfig
+from calibre.gui2.store.search_result import SearchResult
+from calibre.gui2.store.web_store_dialog import WebStoreDialog
+
+class ChitankaStore(BasicStoreConfig, StorePlugin):
+
+    def open(self, parent=None, detail_item=None, external=False):
+        url = 'http://chitanka.info'
+
+        if external or self.config.get('open_external', False):
+            if detail_item:
+                url = url + detail_item
+            open_url(QUrl(url_slash_cleaner(url)))
+        else:
+            detail_url = None
+            if detail_item:
+                detail_url = url + detail_item
+            d = WebStoreDialog(self.gui, url, parent, detail_url)
+            d.setWindowTitle(self.name)
+            d.set_tags(self.config.get('tags', ''))
+            d.exec_()
+
+    def search(self, query, max_results=10, timeout=60):
+
+        url = 'http://chitanka.info/search?q=' +  urllib.quote(query) #urllib.quote(query.encode('utf-8'))
+
+        br = browser()
+
+        counter = max_results
+        with closing(br.open(url, timeout=timeout)) as f:
+            ff = unicode(f.read(), 'utf-8')
+            doc = html.fromstring(ff)
+
+            for data in doc.xpath('//ul[@class="superlist booklist"]/li'):
+                if counter <= 0:
+                    break
+
+                id = ''.join(data.xpath('.//a[@class="booklink"]/@href'))
+                if not id:
+                    continue
+
+                cover_url = ''.join(data.xpath('.//a[@class="booklink"]/img/@src'))
+                title = ''.join(data.xpath('.//a[@class="booklink"]/i/text()'))
+                author = ''.join(data.xpath('.//span[@class="bookauthor"]/a/text()'))
+                fb2 = ''.join(data.xpath('.//a[@class="dl dl-fb2"]/@href'))
+                epub = ''.join(data.xpath('.//a[@class="dl dl-epub"]/@href'))
+                txt = ''.join(data.xpath('.//a[@class="dl dl-txt"]/@href'))
+                #remove .zip extensions
+                if fb2.find('.zip') <> -1:
+                    fb2 = fb2[:fb2.find('.zip')]
+                if epub.find('.zip') <> -1:
+                    epub = epub[:epub.find('.zip')]
+                if txt.find('.zip') <> -1:
+                    txt = txt[:txt.find('.zip')]
+
+                counter -= 1
+
+                s = SearchResult()
+                s.cover_url = cover_url
+                s.title = title.strip()
+                s.author = author.strip()
+                s.detail_item = id.strip()
+                s.drm = SearchResult.DRM_UNLOCKED
+                s.downloads['FB2'] = 'http://chitanka.info' + fb2.strip()
+                s.downloads['EPUB'] = 'http://chitanka.info' + epub.strip()
+                s.downloads['TXT'] = 'http://chitanka.info' + txt.strip()
+                s.formats = 'FB2, EPUB, TXT, SFB'
+                yield s