diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 7315deca40..360947de2a 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -19,7 +19,7 @@ import mechanize
 
 mimetypes.add_type('application/epub+zip',                '.epub')
 mimetypes.add_type('text/x-sony-bbeb+xml',                '.lrs')
-mimetypes.add_type('http://www.w3.org/1999/xhtml',        '.xhtml')
+mimetypes.add_type('application/xhtml+xml',               '.xhtml')
 mimetypes.add_type('image/svg+xml',                       '.svg')
 mimetypes.add_type('application/x-sony-bbeb',             '.lrf')
 mimetypes.add_type('application/x-dtbncx+xml',            '.ncx')
diff --git a/src/calibre/web/fetch/simple.py b/src/calibre/web/fetch/simple.py
index 0d073ecce7..f846c7f2e5 100644
--- a/src/calibre/web/fetch/simple.py
+++ b/src/calibre/web/fetch/simple.py
@@ -410,6 +410,7 @@ class RecursiveFetcher(object, LoggingInterface):
                         _fname.decode('latin1', 'replace')
                     _fname = _fname.encode('ascii', 'replace').replace('%', '').replace(os.sep, '')
                     _fname = sanitize_file_name(_fname)
+                    _fname = os.path.splitext(_fname)[0]+'.xhtml'
                     res = os.path.join(linkdiskpath, _fname)
                     self.downloaded_paths.append(res)
                     self.filemap[nurl] = res