diff --git a/mangle/image.py b/mangle/image.py
index 9f430da..4aae135 100644
--- a/mangle/image.py
+++ b/mangle/image.py
@@ -74,7 +74,9 @@ class KindleData:
         'Kindle 3': ((600, 800), Palette15a),
         'Kindle 4': ((600, 800), Palette15b),
         'Kindle DX': ((824, 1200), Palette15a),
-        'Kindle DXG': ((824, 1200), Palette15a)
+        'Kindle DXG': ((824, 1200), Palette15a),
+        'Kindle Touch': ((600, 800), Palette15a), 
+        'Kindle Paperwhite': ((758, 1024), Palette15b) # resolution given in manual, see http://kindle.s3.amazonaws.com/Kindle_Paperwhite_Users_Guide.pdf
     }
 
 
diff --git a/mangle/ui/options.ui b/mangle/ui/options.ui
index 47f0099..a8e8564 100644
--- a/mangle/ui/options.ui
+++ b/mangle/ui/options.ui
@@ -86,6 +86,16 @@
             <string>Kindle DXG</string>
            </property>
           </item>
+          <item>
+           <property name="text">
+            <string>Kindle Touch</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Kindle Paperwhite</string>
+           </property>
+          </item>
          </widget>
         </item>
         <item row="1" column="0">