diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index a40878480f..14d3c79062 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -233,7 +233,7 @@ class RTFMetadataWriter(MetadataWriterPlugin):
 class MOBIMetadataWriter(MetadataWriterPlugin):
     
     name        = 'Set MOBI metadata'
-    file_types  = set(['mobi', 'prc'])
+    file_types  = set(['mobi', 'prc', 'azw'])
     description = _('Set metadata in %s files')%'MOBI'
     author      = 'Marshall T. Vandegrift'
     
@@ -246,4 +246,4 @@ plugins = [HTML2ZIP]
 plugins += [x for x in list(locals().values()) if isinstance(x, type) and \
                                         x.__name__.endswith('MetadataReader')]
 plugins += [x for x in list(locals().values()) if isinstance(x, type) and \
-                                        x.__name__.endswith('MetadataWriter')]
\ No newline at end of file
+                                        x.__name__.endswith('MetadataWriter')]
diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py
index eed5670cac..579291a83b 100644
--- a/src/calibre/web/feeds/recipes/__init__.py
+++ b/src/calibre/web/feeds/recipes/__init__.py
@@ -31,7 +31,7 @@ recipe_modules = ['recipe_' + r for r in (
            'pobjeda', 'chicago_breaking_news', 'glasgow_herald', 'linuxdevices',
            'hindu', 'cincinnati_enquirer', 'physics_world', 'pressonline',
            'la_republica', 'physics_today', 'chicago_tribune', 'e_novine',
-           'al_jazeera',
+           'al_jazeera', 'winsupersite', 
           )]
 
 import re, imp, inspect, time, os
diff --git a/src/calibre/web/feeds/recipes/recipe_winsupersite.py b/src/calibre/web/feeds/recipes/recipe_winsupersite.py
new file mode 100644
index 0000000000..fc6bc54da2
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_winsupersite.py
@@ -0,0 +1,28 @@
+import re
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Winsupersite(BasicNewsRecipe):
+    title          = u'Supersite for Windows'
+    description           = u'Paul Thurrott SuperSite for Windows'
+    publisher             = 'Paul Thurrott'
+    __author__            = 'Hypernova'
+    language              = _('English')
+    oldest_article = 30
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    remove_javascript     = True
+    html2lrf_options = ['--ignore-tables']
+    html2epub_options = 'linearize_tables = True'
+    remove_tags_before = dict(name='h1')
+    preprocess_regexps = [
+   (re.compile(r'<p>--Paul Thurrott.*</body>', re.DOTALL|re.IGNORECASE),
+    lambda match: '</body>'),
+]
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser()
+        br.open('http://www.winsupersite.com')
+        return br
+    
+    feeds          = [(u'Supersite for Windows', u'http://www.winsupersite.com/supersite.xml')]