diff --git a/src/calibre/devices/nokia/driver.py b/src/calibre/devices/nokia/driver.py
index f993817461..7749f85e26 100644
--- a/src/calibre/devices/nokia/driver.py
+++ b/src/calibre/devices/nokia/driver.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 __license__   = 'GPL v3'
-__copyright__ = '2009, John Schember <john at nachtimwald.com>'
+__copyright__ = '2009-2014, John Schember <john at nachtimwald.com> and Andres Gomez <agomez at igalia.com>'
 __docformat__ = 'restructuredtext en'
 
 '''
@@ -14,13 +14,13 @@ class N770(USBMS):
 
     name           = 'Nokia 770 Device Interface'
     gui_name       = 'Nokia 770'
-    description    = _('Communicate with the Nokia 770 internet tablet.')
-    author         = 'John Schember'
+    description    = _('Communicate with the Nokia 770 Internet Tablet.')
+    author         = 'John Schember and Andres Gomez'
     supported_platforms = ['windows', 'linux', 'osx']
 
     # Ordered list of supported formats
-    FORMATS     = ['mobi', 'prc', 'epub', 'html', 'zip', 'fb2', 'chm', 'pdb',
-        'tcr', 'txt', 'rtf']
+    FORMATS     = ['mobi', 'prc', 'epub', 'pdf', 'html', 'zip', 'fb2', 'chm',
+        'pdb', 'tcr', 'txt', 'rtf']
 
     VENDOR_ID   = [0x421]
     PRODUCT_ID  = [0x431]
@@ -29,22 +29,22 @@ class N770(USBMS):
     VENDOR_NAME      = 'NOKIA'
     WINDOWS_MAIN_MEM = '770'
 
-    MAIN_MEMORY_VOLUME_LABEL  = 'N770 Main Memory'
+    MAIN_MEMORY_VOLUME_LABEL  = 'Nokia 770 Main Memory'
 
     EBOOK_DIR_MAIN = 'My Ebooks'
     SUPPORTS_SUB_DIRS = True
 
 class N810(N770):
-    name           = 'Nokia 810 Device Interface'
-    gui_name       = 'Nokia 810/900/9'
-    description    = _('Communicate with the Nokia 810/900 internet tablet.')
+    name           = 'Nokia N800/N810/N900/N950/N9 Device Interface'
+    gui_name       = 'Nokia N800/N810/N900/N950/N9'
+    description    = _('Communicate with the Nokia N800/N810/N900/N950/N9 Maemo/MeeGo devices.')
 
-    PRODUCT_ID = [0x96, 0x1c7, 0x0518]
+    PRODUCT_ID = [0x4c3, 0x96, 0x1c7, 0x3d1, 0x518]
     BCD        = [0x316]
 
-    WINDOWS_MAIN_MEM = ['N810', 'N900', 'NOKIA_N9']
+    WINDOWS_MAIN_MEM = ['N800', 'N810', 'N900', 'NOKIA_N950', 'NOKIA_N9']
 
-    MAIN_MEMORY_VOLUME_LABEL = 'Nokia Tablet Main Memory'
+    MAIN_MEMORY_VOLUME_LABEL = 'Nokia Maemo/MeeGo device Main Memory'
 
 class E71X(USBMS):