diff --git a/src/calibre/devices/nook/driver.py b/src/calibre/devices/nook/driver.py
index 9c8f882f3d..c4991c9428 100644
--- a/src/calibre/devices/nook/driver.py
+++ b/src/calibre/devices/nook/driver.py
@@ -83,7 +83,7 @@ class NOOK(USBMS):
 class NOOK_COLOR(NOOK):
     description    = _('Communicate with the Nook Color and TSR eBook readers.')
 
-    PRODUCT_ID  = [0x002, 0x003]
+    PRODUCT_ID  = [0x002, 0x003, 0x004]
     BCD         = [0x216]
 
     WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'EBOOK_DISK'
@@ -105,4 +105,3 @@ class NOOK_COLOR(NOOK):
         return USBMS.create_upload_path(self, path, mdata, fname,
                 create_dirs=create_dirs)
 
-
diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index 7b825de294..3ca482c6ef 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -111,6 +111,7 @@ class KindleFire(KindleDX):
     name = 'Kindle Fire'
     id = 'kindle_fire'
     output_profile = 'kindle_fire'
+    supports_color = True
 
 class Sony505(Device):
 
@@ -184,6 +185,10 @@ class NookColor(Nook):
     output_profile = 'nook_color'
     supports_color = True
 
+class NookTablet(NookColor):
+    id = 'nook_tablet'
+    name = 'Nook Tablet'
+
 class CybookG3(Device):
 
     name = 'Cybook Gen 3'