diff --git a/src/calibre/devices/__init__.py b/src/calibre/devices/__init__.py
index e68a8b3de3..ebb95a4e86 100644
--- a/src/calibre/devices/__init__.py
+++ b/src/calibre/devices/__init__.py
@@ -11,7 +11,7 @@ def devices():
     from calibre.devices.prs700.driver import PRS700
     from calibre.devices.cybookg3.driver import CYBOOKG3
     from calibre.devices.kindle.driver import KINDLE
-    return (PRS500, PRS505, PRS700, CYBOOKG3)
+    return (PRS500, PRS505, PRS700, CYBOOKG3, KINDLE)
 
 import time
 
diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py
index 83624d6b5d..2ed41ac898 100644
--- a/src/calibre/ebooks/mobi/reader.py
+++ b/src/calibre/ebooks/mobi/reader.py
@@ -267,6 +267,12 @@ class MobiReader(object):
                     'xx-large' : '6',
                     }
         for tag in root.iter(etree.Element):
+            if tag.tag in ('country-region', 'place', 'placetype', 'placename',
+                           'state', 'city'):
+                tag.tag = 'span'
+                for key in tag.attrib.keys():
+                    tag.attrib.pop(key)
+                continue
             styles, attrib = [], tag.attrib
             if attrib.has_key('style'):
                 style = attrib.pop('style').strip()