diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 36bcbdbfe2..ff9861c537 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -1171,13 +1171,19 @@ class StoreFoylesUKStore(StoreBase):
     description = _('Foyles of London, online')
     actual_plugin = 'calibre.gui2.store.foyles_uk_plugin:FoylesUKStore'
 
-class AmazonDEKindleStore(StoreBase):
+class StoreAmazonDEKindleStore(StoreBase):
     name = 'Amazon DE Kindle'
     description = _('Kindle eBooks')
     actual_plugin = 'calibre.gui2.store.amazon_de_plugin:AmazonDEKindleStore'
 
-plugins += [StoreAmazonKindleStore, AmazonDEKindleStore, StoreAmazonUKKindleStore,
-    StoreBaenWebScriptionStore, StoreBNStore,
+class StoreBeamEBooksDEStore(StoreBase):
+    name = 'Beam EBooks DE'
+    description = _('Kindle eBooks')
+    actual_plugin = 'calibre.gui2.store.beam_ebooks_de_plugin:BeamEBooksDEStore'
+
+plugins += [StoreAmazonKindleStore, StoreAmazonDEKindleStore,
+    StoreAmazonUKKindleStore,
+    StoreBaenWebScriptionStore, StoreBNStore, StoreBeamEBooksDEStore,
     StoreBeWriteStore, StoreDieselEbooksStore, StoreEbookscomStore,
     StoreEHarlequinStoretore, StoreFeedbooksStore,
     StoreFoylesUKStore, StoreGutenbergStore, StoreKoboStore, StoreManyBooksStore,
diff --git a/src/calibre/gui2/store/beam_ebooks_de_plugin.py b/src/calibre/gui2/store/beam_ebooks_de_plugin.py
new file mode 100644
index 0000000000..18cff7a411
--- /dev/null
+++ b/src/calibre/gui2/store/beam_ebooks_de_plugin.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+import urllib2
+from contextlib import closing
+
+from lxml import html
+
+from PyQt4.Qt import QUrl
+
+from calibre import browser
+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 BeamEBooksDEStore(BasicStoreConfig, StorePlugin):
+
+    def open(self, parent=None, detail_item=None, external=False):
+        url = 'http://www.beam-ebooks.de'
+        url_details = 'http://www.beam-ebooks.de{0}'
+
+        if external or self.config.get('open_external', False):
+            if detail_item:
+                url = url_details.format(detail_item)
+            open_url(QUrl(url))
+        else:
+            detail_url = None
+            if detail_item:
+                detail_url = url_details.format(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://www.beam-ebooks.de/suchergebnis.php?Type=&sw=' + urllib2.quote(query)
+        print(url)
+        br = browser()
+
+        counter = max_results
+        with closing(br.open(url, timeout=timeout)) as f:
+            doc = html.fromstring(f.read())
+            print(doc)
+            for data in doc.xpath('//table[tr/td/div[@class="stil2"]]'):
+                print('here1')
+                if counter <= 0:
+                    break
+
+                id = ''.join(data.xpath('./tr/td/div[@class="stil2"]/a/@href')).strip()
+                print('here', id)
+                if not id:
+                    continue
+                cover_url = ''.join(data.xpath('./tr/td[1]/a/img/@src'))
+                if cover_url:
+                    cover_url = 'http://www.beam-ebooks.de' + cover_url
+                title = ''.join(data.xpath('./tr/td/div[@class="stil2"]/a/b/text()'))
+                author = ' '.join(data.xpath('./tr/td/div[@class="stil2"]/child::b/text()|./tr/td/div[@class="stil2"]/child::strong/text()'))
+                price = ''.join(data.xpath('./tr/td[3]/text()'))
+                print(data.xpath('./tr/td[3]/a/img/@alt'))
+                pdf = data.xpath('boolean(./tr/td[3]/a/img[contains(@alt, "PDF")]/@alt)')
+                epub = data.xpath('boolean(./tr/td[3]/a/img[contains(@alt, "ePub")]/@alt)')
+                mobi = data.xpath('boolean(./tr/td[3]/a/img[contains(@alt, "Mobipocket")]/@alt)')
+                print(id, cover_url, title, author, price, pdf, epub, mobi)
+                counter -= 1
+
+                s = SearchResult()
+                s.cover_url = cover_url
+                s.title = title.strip()
+                s.author = author.strip()
+                s.price = price
+                s.drm = SearchResult.DRM_UNLOCKED
+                s.detail_item = id
+                formats = []
+                if epub:
+                    formats.append('ePub')
+                if pdf:
+                    formats.append('PDF')
+                if mobi:
+                    formats.append('MOBI')
+                s.formats = ', '.join(formats)
+
+                yield s
diff --git a/src/calibre/gui2/store/foyles_uk_plugin.py b/src/calibre/gui2/store/foyles_uk_plugin.py
index ca35fb6bb2..1a997cd671 100644
--- a/src/calibre/gui2/store/foyles_uk_plugin.py
+++ b/src/calibre/gui2/store/foyles_uk_plugin.py
@@ -73,6 +73,6 @@ class FoylesUKStore(BasicStoreConfig, StorePlugin):
                 s.price = price
                 s.detail_item = id
                 s.drm = SearchResult.DRM_LOCKED
-                s.formats = 'EPUB'
+                s.formats = 'ePub'
 
                 yield s
diff --git a/src/calibre/gui2/store/waterstones_uk_plugin.py b/src/calibre/gui2/store/waterstones_uk_plugin.py
index d422165c47..a5065128ba 100644
--- a/src/calibre/gui2/store/waterstones_uk_plugin.py
+++ b/src/calibre/gui2/store/waterstones_uk_plugin.py
@@ -76,7 +76,7 @@ class WaterstonesUKStore(BasicStoreConfig, StorePlugin):
                 s.detail_item = id
                 formats = []
                 if epub:
-                    formats.append('EPUB')
+                    formats.append('ePub')
                 if pdf:
                     formats.append('PDF')
                 s.formats = ', '.join(formats)