diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 9d4b0694cc..040f28549e 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -420,7 +420,7 @@ from calibre.devices.eslick.driver import ESLICK
 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
+from calibre.devices.hanvon.driver import N516, EB511
 
 from calibre.ebooks.metadata.fetch import GoogleBooks, ISBNDB, Amazon
 from calibre.library.catalog import CSV_XML, EPUB_MOBI
@@ -494,6 +494,7 @@ plugins += [
     EB600,
     README,
     N516,
+    EB511,
 ]
 plugins += [x for x in list(locals().values()) if isinstance(x, type) and \
                                         x.__name__.endswith('MetadataReader')]
diff --git a/src/calibre/devices/hanvon/driver.py b/src/calibre/devices/hanvon/driver.py
index ea8d604dd5..d4f6e87d06 100644
--- a/src/calibre/devices/hanvon/driver.py
+++ b/src/calibre/devices/hanvon/driver.py
@@ -7,6 +7,7 @@ __docformat__ = 'restructuredtext en'
 '''
 Device driver for Hanvon devices
 '''
+import re
 
 from calibre.devices.usbms.driver import USBMS
 
@@ -32,3 +33,25 @@ class N516(USBMS):
 
     EBOOK_DIR_MAIN = 'e_book'
     SUPPORTS_SUB_DIRS = True
+
+class EB511(USBMS):
+    name           = 'Elonex EB 511 driver'
+    gui_name       = 'EB 511'
+    description    = _('Communicate with the Elonex EB 511 eBook reader.')
+    author         = 'Kovid Goyal'
+    supported_platforms = ['windows', 'osx', 'linux']
+
+    FORMATS     = ['epub', 'html', 'pdf', 'txt']
+
+    VENDOR_ID   = [0x45e]
+    PRODUCT_ID  = [0xffff]
+    BCD         = [0x0]
+
+    MAIN_MEMORY_VOLUME_LABEL  = 'EB 511 Internal Memory'
+
+    EBOOK_DIR_MAIN = 'e_book'
+    SUPPORTS_SUB_DIRS = True
+
+    OSX_MAIN_MEM_VOL_PAT = re.compile(r'/eReader')
+
+