diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index b8c8c9885f..3194a64de0 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -1046,6 +1046,11 @@ class StoreAmazonKindleStore(StoreBase):
     name = 'Amazon Kindle'
     description = _('Kindle books from Amazon')
     actual_plugin = 'calibre.gui2.store.amazon_plugin:AmazonKindleStore'
+    
+class StoreBaenWebScriptionStore(StoreBase):
+    name = 'Baen WebScription'
+    description = _('Ebooks for readers.')
+    actual_plugin = 'calibre.gui2.store.baen_webscription_plugin:BaenWebScriptionStore'
 
 class StoreDieselEbooksStore(StoreBase):
     name = 'Diesel eBooks'
@@ -1087,7 +1092,7 @@ class StoreSmashwordsStore(StoreBase):
     description = _('Your ebook. Your way.')
     actual_plugin = 'calibre.gui2.store.smashwords_plugin:SmashwordsStore'
 
-plugins += [StoreAmazonKindleStore, StoreDieselEbooksStore, StoreEbookscomStore,
+plugins += [StoreAmazonKindleStore, StoreBaenWebScriptionStore, StoreDieselEbooksStore, StoreEbookscomStore,
     StoreFeedbooksStore, StoreGutenbergStore, StoreKoboStore, StoreManyBooksStore,
     StoreOpenLibraryStore, StoreSmashwordsStore]
 
diff --git a/src/calibre/gui2/store/baen_webscription_plugin.py b/src/calibre/gui2/store/baen_webscription_plugin.py
new file mode 100644
index 0000000000..1e7c093d37
--- /dev/null
+++ b/src/calibre/gui2/store/baen_webscription_plugin.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+import re
+import urllib2
+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 BaenWebScriptionStore(BasicStoreConfig, StorePlugin):
+    
+    def open(self, parent=None, detail_item=None, external=False):
+        settings = self.get_settings()
+        url = 'http://www.webscription.net/'
+
+        if external or settings.get(self.name + '_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(settings.get(self.name + '_tags', ''))
+            d = d.exec_()
+
+    def search(self, query, max_results=10, timeout=60):
+        url = 'http://www.webscription.net/searchadv.aspx?IsSubmit=true&SearchTerm=' + urllib2.quote(query)
+        
+        br = browser()
+        
+        counter = max_results
+        with closing(br.open(url, timeout=timeout)) as f:
+            doc = html.fromstring(f.read())
+            for data in doc.xpath('//table/tr/td/img[@src="skins/Skin_1/images/matchingproducts.gif"]/..//tr'):
+                if counter <= 0:
+                    break
+                
+                id = ''.join(data.xpath('./td[1]/a/@href'))
+                if not id:
+                    continue
+                
+                title = ''.join(data.xpath('./td[1]/a/text()'))
+                
+                author = ''
+                cover_url = ''
+                price = ''
+                
+                with closing(br.open('http://www.webscription.net/' + id.strip(), timeout=timeout/4)) as nf:
+                    idata = html.fromstring(nf.read())
+                    author = ''.join(idata.xpath('//span[@class="ProductNameText"]/../b/text()'))
+                    author = author.split('by ')[-1]
+                    price = ''.join(idata.xpath('//span[@class="variantprice"]/text()'))
+                    a, b, price = price.partition('$')
+                    price = b + price
+                    
+                    pnum = ''
+                    mo = re.search(r'p-(?P<num>\d+)-', id.strip())
+                    if mo:
+                        pnum = mo.group('num')
+                    if pnum:
+                        cover_url = 'http://www.webscription.net/' + ''.join(idata.xpath('//img[@id="ProductPic%s"]/@src' % pnum))
+                
+                counter -= 1
+                
+                s = SearchResult()
+                s.cover_url = cover_url
+                s.title = title.strip()
+                s.author = author.strip()
+                s.price = price
+                s.detail_item = id.strip()
+                
+                yield s