--- calibre/setup/extensions.py.orig	2012-08-31 05:41:35.000000000 +0200
+++ calibre/setup/extensions.py	2012-08-31 12:20:08.558655474 +0200
@@ -204,19 +204,6 @@
         libraries=['usb-1.0']
     ))
 
-    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.orig	2012-08-31 05:41:35.000000000 +0200
+++ calibre/src/calibre/constants.py	2012-08-31 12:21:06.784448192 +0200
@@ -96,7 +96,6 @@
             plugins.append('usbobserver')
         if islinux or isosx:
             plugins.append('libusb')
-            plugins.append('libmtp')
         self.plugins = frozenset(plugins)
 
     def load_plugin(self, name):