diff --git a/src/calibre/customize/profiles.py b/src/calibre/customize/profiles.py
index 3b471ee47f..2e0280d523 100644
--- a/src/calibre/customize/profiles.py
+++ b/src/calibre/customize/profiles.py
@@ -652,6 +652,15 @@ class KindleDXOutput(OutputProfile):
         return u'%s <br/><span style="color: white">%s</span>' % (', '.join(tags),
                 'ttt '.join(tags)+'ttt ')
 
+class KindleFireOutput(KindleDXOutput):
+
+    name = 'Kindle Fire'
+    short_name = 'kindle_fire'
+    description = _('This profile is intended for the Amazon Kindle Fire.')
+
+    screen_size               = (570, 1016)
+    dpi                       = 150.0
+    comic_screen_size = (570, 1016)
 
 class IlliadOutput(OutputProfile):
 
diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index cd599ab367..7b825de294 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -110,6 +110,7 @@ class KindleDX(Kindle):
 class KindleFire(KindleDX):
     name = 'Kindle Fire'
     id = 'kindle_fire'
+    output_profile = 'kindle_fire'
 
 class Sony505(Device):