diff --git a/src/calibre/ebooks/oeb/iterator.py b/src/calibre/ebooks/oeb/iterator.py
index 9b9158b37e..33cc96f08b 100644
--- a/src/calibre/ebooks/oeb/iterator.py
+++ b/src/calibre/ebooks/oeb/iterator.py
@@ -150,7 +150,8 @@ class EbookIterator(object):
         self.language = self.opf.language
         if self.language:
             self.language = self.language.lower()
-        self.spine = [SpineItem(i.path) for i in self.opf.spine]
+        self.spine = [SpineItem(i.path) for i in self.opf.spine if i.is_linear]
+        self.spine += [SpineItem(i.path) for i in self.opf.spine if not i.is_linear]
 
         cover = self.opf.cover
         if self.ebook_ext in ('lit', 'mobi', 'prc', 'opf') and cover:
diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index 8ebb3528d1..8610d8bba7 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -63,6 +63,14 @@ class Kindle(Device):
     manufacturer = 'Amazon'
     id = 'kindle'
 
+class JetBook(Device):
+
+    output_profile = 'jetbook5'
+    output_format  = 'EPUB'
+    name = 'JetBook'
+    manufacturer = 'Ectaco'
+    id = 'jetbook'
+
 class KindleDX(Kindle):
 
     output_profile = 'kindle_dx'