diff -u pyinotify-0.5.2/debian/control pyinotify-0.5.2/debian/control
--- pyinotify-0.5.2/debian/control
+++ pyinotify-0.5.2/debian/control
@@ -1,7 +1,8 @@
 Source: pyinotify
 Section: python
 Priority: optional
-Maintainer: Hans Ulrich Niedermann <debian@n-dimensional.de>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Hans Ulrich Niedermann <debian@n-dimensional.de>
 Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-support (>= 0.3)
 Standards-Version: 3.7.2
 
diff -u pyinotify-0.5.2/debian/changelog pyinotify-0.5.2/debian/changelog
--- pyinotify-0.5.2/debian/changelog
+++ pyinotify-0.5.2/debian/changelog
@@ -1,3 +1,11 @@
+pyinotify (0.5.2-1.1ubuntu2) feisty; urgency=low
+
+  * debian/rules
+    - Rebuild the _inotify.so library for each python version
+    - Fixes LP:#85705
+
+ -- Christopher James Halse Rogers (RAOF) <chalserogers@gmail.com>  Sat, 17 Feb 2007 16:55:51 +1100
+
 pyinotify (0.5.2-1.1ubuntu1) edgy; urgency=low
 
   * rebuild to fix package contents
diff -u pyinotify-0.5.2/debian/rules pyinotify-0.5.2/debian/rules
--- pyinotify-0.5.2/debian/rules
+++ pyinotify-0.5.2/debian/rules
@@ -22,7 +22,10 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
-	for python in $(PYVERS); do \
+#Since setup.py doesn't segregate _inotify.so by the python version it's built
+#against, we need to build and install in one go for each python version.
+#(LP #85705)
+#	for python in $(PYVERS); do \
 		"$${python}" setup.py build; \
 	done
 	touch $@
@@ -45,7 +48,10 @@
 	dh_clean -k
 	dh_installdirs
 
+#setup.py does not segregate the _inotify.so based on python build version
+#We therefore need to rebuild it before installing for each version.
 	for python in $(PYVERS); do \
+		$$python setup.py build --force ; \
 		$$python setup.py install --root=$(CURDIR)/debian/python-pyinotify; \
 	done
 
@@ -61,7 +67,6 @@
 	dh_compress -i -Xexamples
 	dh_fixperms -i
 	dh_pysupport -i
-	dh_python -i
 	dh_installdeb -i
 	dh_shlibdeps -i
 	dh_gencontrol -i
@@ -79,7 +84,6 @@
 	dh_compress -a
 	dh_fixperms -a
 	dh_pysupport -a
-	dh_python -a
 	dh_installdeb -a
 	dh_shlibdeps -a 
 	dh_gencontrol -a