diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 79214b667a..07c0dc0bd3 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -567,7 +567,7 @@ from calibre.devices.nuut2.driver import NUUT2
 from calibre.devices.iriver.driver import IRIVER_STORY
 from calibre.devices.binatone.driver import README
 from calibre.devices.hanvon.driver import (N516, EB511, ALEX, AZBOOKA, THEBOOK,
-        LIBREAIR)
+        LIBREAIR, ODYSSEY)
 from calibre.devices.edge.driver import EDGE
 from calibre.devices.teclast.driver import (TECLAST_K3, NEWSMY, IPAPYRUS,
         SOVOS, PICO, SUNSTECH_EB700, ARCHOS7O, STASH, WEXLER)
@@ -689,7 +689,7 @@ plugins += [
     IPAPYRUS,
     EDGE,
     SNE,
-    ALEX,
+    ALEX, ODYSSEY,
     PALMPRE,
     KOBO,
     AZBOOKA,
diff --git a/src/calibre/devices/hanvon/driver.py b/src/calibre/devices/hanvon/driver.py
index 11b064b783..2d6b825c37 100644
--- a/src/calibre/devices/hanvon/driver.py
+++ b/src/calibre/devices/hanvon/driver.py
@@ -164,4 +164,21 @@ class EB511(USBMS):
 
     OSX_MAIN_MEM_VOL_PAT = re.compile(r'/eReader')
 
+class ODYSSEY(N516):
+    name  = 'Cybook Odyssey driver'
+    gui_name       = 'Odyssey'
+    description    = _('Communicate with the Cybook Odyssey eBook reader.')
+
+    BCD = [0x316]
+    VENDOR_NAME      = 'LINUX'
+    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'FILE-STOR_GADGET'
+
+    FORMATS     = ['epub', 'fb2', 'html', 'pdf', 'txt']
+
+    EBOOK_DIR_MAIN = 'calibre'
+
+    def get_main_ebook_dir(self, for_upload=False):
+        if for_upload:
+            return self.EBOOK_DIR_MAIN
+        return ''
 
diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index 3ca482c6ef..841fc6181a 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -209,6 +209,12 @@ class CybookOrizon(CybookOpus):
     name = 'Cybook Orizon'
     id = 'cybook_orizon'
 
+class CybookOdyssey(CybookOpus):
+
+    name = 'Cybook Odyssey'
+    id = 'cybook_odyssey'
+
+
 class PocketBook360(CybookOpus):
 
     manufacturer = 'PocketBook'
diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst
index fb94a0d479..3700451b2d 100644
--- a/src/calibre/manual/faq.rst
+++ b/src/calibre/manual/faq.rst
@@ -117,8 +117,8 @@ How can I help get my device supported in |app|?
 If your device appears as a USB disk to the operating system, adding support for it to |app| is very easy.
 We just need some information from you:
 
-  * What ebook formats does your device support?
-  * Is there a special directory on the device in which all ebook files should be placed?
+  * Complete list of ebook formats that your device supports.
+  * Is there a special directory on the device in which all ebook files should be placed? Also does the device detect files placed in sub directories?
   * We also need information about your device that |app| will collect automatically. First, if your
     device supports SD cards, insert them. Then connect your device to the computer. In calibre go to :guilabel:`Preferences->Advanced->Miscellaneous`
     and click the "Debug device detection" button. This will create some debug output. Copy it to a file