diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 36ffc19cbf..6e0c9321cd 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -462,6 +462,7 @@ plugins += [
     ILIAD,
     IREXDR1000,
     JETBOOK,
+    SHINEBOOK,
     KINDLE,
     KINDLE2,
     KINDLE_DX,
@@ -480,7 +481,6 @@ plugins += [
     POCKETBOOK360,
     GER2,
     ITALICA,
-    SHINEBOOK,
     ECLICTO,
     DBOOK,
     BOOX,
diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index 9be9e27864..fe89e57a94 100644
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -16,6 +16,7 @@ Windows PNP strings:
 '''
 
 from calibre.devices.usbms.driver import USBMS
+from calibre.constants import iswindows
 
 class EB600(USBMS):
 
@@ -81,6 +82,19 @@ class SHINEBOOK(EB600):
 
     VENDOR_NAME      = 'LONGSHIN'
     WINDOWS_MAIN_MEM = 'ESHINEBOOK'
+    MAIN_MEMORY_VOLUME_LABEL  = 'ShineBook Main Memory'
+    STORAGE_CARD_VOLUME_LABEL = 'ShineBook Storage Card'
+
+
+    @classmethod
+    def can_handle(cls, dev, debug=False):
+        try:
+            if not iswindows:
+                return dev[4] == 'ShineBook'
+        except:
+            return True
+
+
 
 class POCKETBOOK360(EB600):
 
diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst
index 33e144e0e5..0319f5bb21 100644
--- a/src/calibre/manual/faq.rst
+++ b/src/calibre/manual/faq.rst
@@ -81,7 +81,7 @@ Device Integration
 
 What devices does |app| support?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-At the moment |app| has full support for the SONY PRS 300/500/505/600/700/900, Barnes & Noble Nook, Cybook Gen 3/Opus, Amazon Kindle 1/2/DX, Netronix EB600, Ectaco Jetbook, BeBook/BeBook Mini, Irex Illiad/DR1000, Foxit eSlick, PocketBook 360, Italica, eClicto, Iriver Story, Airis dBook, various Android phones and the iPhone. In addition, using the :guilabel:`Save to disk` function you can use it with any ebook reader that exports itself as a USB disk.
+At the moment |app| has full support for the SONY PRS 300/500/505/600/700/900, Barnes & Noble Nook, Cybook Gen 3/Opus, Amazon Kindle 1/2/DX, Longshine ShineBook, Ectaco Jetbook, BeBook/BeBook Mini, Irex Illiad/DR1000, Foxit eSlick, PocketBook 360, Italica, eClicto, Iriver Story, Airis dBook, various Android phones and the iPhone. In addition, using the :guilabel:`Save to disk` function you can use it with any ebook reader that exports itself as a USB disk.
 
 How can I help get my device supported in |app|?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/calibre/utils/ipc/worker.py b/src/calibre/utils/ipc/worker.py
index 9128673715..3d04298a65 100644
--- a/src/calibre/utils/ipc/worker.py
+++ b/src/calibre/utils/ipc/worker.py
@@ -78,7 +78,7 @@ def main():
         # On some OS X computers launchd apparently tries to
         # launch the last run process from the bundle
         from calibre.gui2.main import main as gui_main
-        return gui_main([])
+        return gui_main(['calibre'])
     address = cPickle.loads(unhexlify(os.environ['CALIBRE_WORKER_ADDRESS']))
     key     = unhexlify(os.environ['CALIBRE_WORKER_KEY'])
     resultf = unhexlify(os.environ['CALIBRE_WORKER_RESULT'])