diff --git a/src/calibre/devices/__init__.py b/src/calibre/devices/__init__.py
index cd3cd30734..06efbc6434 100644
--- a/src/calibre/devices/__init__.py
+++ b/src/calibre/devices/__init__.py
@@ -12,11 +12,13 @@ def devices():
     from calibre.devices.cybookg3.driver import CYBOOKG3
     from calibre.devices.kindle.driver import KINDLE
     from calibre.devices.kindle.driver import KINDLE2
+    from calibre.devices.bebook.driver import BEBOOK
+    from calibre.devices.bebook.driver import BEBOOKMINI
     from calibre.devices.blackberry.driver import BLACKBERRY
     from calibre.devices.eb600.driver import EB600
     from calibre.devices.jetbook.driver import JETBOOK
     return (PRS500, PRS505, PRS700, CYBOOKG3, KINDLE, KINDLE2,
-            BLACKBERRY, EB600, JETBOOK)
+            BEBOOK, BEBOOKMINI, BLACKBERRY, EB600, JETBOOK)
 
 import time
 
diff --git a/src/calibre/devices/bebook/__init__.py b/src/calibre/devices/bebook/__init__.py
new file mode 100644
index 0000000000..a4e8fdad76
--- /dev/null
+++ b/src/calibre/devices/bebook/__init__.py
@@ -0,0 +1,2 @@
+__license__   = 'GPL v3'
+__copyright__ = '2009, Tijmen Ruizendaal <tijmen at mybebook.com>'
diff --git a/src/calibre/devices/bebook/driver.py b/src/calibre/devices/bebook/driver.py
new file mode 100644
index 0000000000..1b81fae27c
--- /dev/null
+++ b/src/calibre/devices/bebook/driver.py
@@ -0,0 +1,45 @@
+__license__   = 'GPL v3'
+__copyright__ = '2009, Tijmen Ruizendaal <tijmen at mybebook.com>'
+'''
+Device driver for BeBook
+'''
+
+from calibre.devices.usbms.driver import USBMS
+
+class BEBOOK(USBMS):
+    # Ordered list of supported formats
+    FORMATS     = ['mobi', 'epub', 'pdf', 'mobi', 'txt']
+
+    VENDOR_ID   = [0x0525]
+    PRODUCT_ID  = [0x8803, 0x6803]
+    BCD		= [0x312]
+
+    VENDOR_NAME = 'BEBOOK'
+    WINDOWS_MAIN_MEM = 'BEBOOK_INTERNAL_MEMORY'
+    WINDOWS_CARD_MEM = 'BEBOOK_STORAGE_CARD'
+
+    OSX_MAIN_MEM = 'BeBook Internal Memory'
+    OSX_CARD_MEM = 'BeBook Storage Card'
+
+    MAIN_MEMORY_VOLUME_LABEL  = 'BeBook Internal Memory'
+    STORAGE_CARD_VOLUME_LABEL = 'BeBook Storage Card'
+
+    SUPPORTS_SUB_DIRS = True
+
+    FDI_LUNS = {'lun0':1, 'lun1':0, 'lun2':2}
+
+class BEBOOKMINI(BEBOOK):
+
+    VENDOR_ID	= [0x0492]
+    PRODUCT_ID	= [0x8813]
+    BCD		= [0x319]
+
+    WINDOWS_MAIN_MEM = 'BEBOOKMINI_INTERNAL_MEMORY'
+    WINDOWS_CARD_MEM = 'BEBOOKMINI_STORAGE_CARD'
+
+    OSX_MAIN_MEM = 'BeBook Mini Internal Memory'
+    OSX_CARD_MEM = 'BeBook Mini Storage Card'
+
+    MAIN_MEMORY_VOLUME_LABEL  = 'BeBook Mini Internal Memory'
+    STORAGE_CARD_VOLUME_LABEL = 'BeBook Mini Storage Card'
+