--- calibre/setup/extensions.py	2012-08-10 05:33:57.000000000 +0200
+++ calibre.orig/setup/extensions.py	2012-08-03 06:45:28.000000000 +0200
@@ -182,20 +174,6 @@
                 ldflags=['-framework', 'IOKit'])
             )
 
-if islinux:
-    extensions.append(Extension('libmtp',
-        [
-        'calibre/devices/mtp/unix/devices.c',
-        'calibre/devices/mtp/unix/libmtp.c'
-        ],
-        headers=[
-        'calibre/devices/mtp/unix/devices.h',
-        'calibre/devices/mtp/unix/upstream/music-players.h',
-        'calibre/devices/mtp/unix/upstream/device-flags.h',
-        ],
-        libraries=['mtp']
-    ))
-
 if isunix:
     cc = os.environ.get('CC', 'gcc')
     cxx = os.environ.get('CXX', 'g++')
--- calibre/src/calibre/constants.py	2012-08-10 05:33:57.000000000 +0200
+++ calibre.orig/src/calibre/constants.py	2012-08-03 06:45:28.000000000 +0200
@@ -90,11 +90,9 @@
                 'speedup',
             ]
         if iswindows:
-            plugins.extend(['winutil', 'wpd'])
+            plugins.append('winutil')
         if isosx:
             plugins.append('usbobserver')
-        if islinux:
-            plugins.append('libmtp')
         self.plugins = frozenset(plugins)
 
     def load_plugin(self, name):