diff -u bicyclerepair-0.9/debian/control bicyclerepair-0.9/debian/control
--- bicyclerepair-0.9/debian/control
+++ bicyclerepair-0.9/debian/control
@@ -2,7 +2,9 @@
 Section: devel
 Priority: optional
 Maintainer: Robert Collins <robertc@robertcollins.net>
-Build-Depends-Indep: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-central (>= 0.5)
+Build-Depends: debhelper (>= 5.0.37.2)
+Build-Depends-Indep: python-all-dev (>= 2.3.5-11), python-central (>= 0.5)
+Homepage: http://bicyclerepair.sourceforge.net/
 Standards-Version: 3.7.2
 XS-Python-Version: all
 
@@ -15,6 +17,5 @@
+Recommends: vim-addon-manager 
 Description: A refactoring tool for python
  A framework and refactoring tool for Python. IDE Plugins are included for
  Pymacs, IDLE and Vim. Using Bicycle Repair Man you can rename classes, methods
  and variables, and all users of them are found and adjusted appropriately.
- .
-  Homepage: http://bicyclerepair.sourceforge.net/
diff -u bicyclerepair-0.9/debian/dirs bicyclerepair-0.9/debian/dirs
--- bicyclerepair-0.9/debian/dirs
+++ bicyclerepair-0.9/debian/dirs
@@ -1,0 +2 @@
+usr/share/vim/registry
diff -u bicyclerepair-0.9/debian/rules bicyclerepair-0.9/debian/rules
--- bicyclerepair-0.9/debian/rules
+++ bicyclerepair-0.9/debian/rules
@@ -41,6 +41,8 @@
 		python$$version setup.py install --no-compile --root=debian/bicyclerepair;\
 	done
 	cp ide-integration/bike.vim debian/bicyclerepair/usr/share/vim/addons/ftplugin/python_bike.vim
+	cp debian/vim-python_bike.yaml debian/bicyclerepair/usr/share/vim/registry/
+   
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -51,26 +53,17 @@
 	dh_installexamples
 #	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman
 	dh_compress
 	dh_fixperms
-#	dh_perl
 	dh_pycentral
 	dh_python
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
+binary-arch:
+
 binary: binary-indep
 .PHONY: build clean binary-indep binary-arch binary install configure
diff -u bicyclerepair-0.9/debian/README.Debian bicyclerepair-0.9/debian/README.Debian
--- bicyclerepair-0.9/debian/README.Debian
+++ bicyclerepair-0.9/debian/README.Debian
@@ -4,5 +4,9 @@
-To start using bicyclerepair, see the README.<editor> files in /usr/share/doc/bicyclerepair.
+To start using bicyclerepair, see the upstream README.<editor> documentation in
+/usr/share/doc/bicyclerepair.
 
-The vim plugin is automatically installed into /usr/share/vim/vim62/plugin/
+The vim plugin requires enabling via vim-addons install python_bike, and having
+'filetype plugin on' set in your ~/.vimrc or similar configuration file.
+Without that setting, ftplugins are not loaded and the BicycleRepair functions
+will not be available.
 
- -- Robert Collins <robertc@robertcollins.net>, Sun, 30 May 2004 00:22:34 +1000
+ -- Robert Collins <robertc@robertcollins.net>
diff -u bicyclerepair-0.9/debian/changelog bicyclerepair-0.9/debian/changelog
--- bicyclerepair-0.9/debian/changelog
+++ bicyclerepair-0.9/debian/changelog
@@ -1,3 +1,21 @@
+bicyclerepair (0.9-6) unstable; urgency=low
+
+  * Add binary-arch rules target. Closes:395580
+  * Change emacs loader code to use python-mode-map rather than py-mode-map.
+    Closes: 380590
+  
+
+ -- Robert Collins <robertc@robertcollins.net>  Sun, 20 Sep 2009 15:40:53 +1000
+
+bicyclerepair (0.9-5) unstable; urgency=low
+
+  * Conform with Vim addon policy. Closes: #464817
+  * Move debhelper depends to B-D, to fix
+    clean-should-be-satisfied-by-build-depends.
+  * Improve documentation in README.Debian.
+
+ -- Robert Collins <robertc@robertcollins.net>  Sun, 20 Sep 2009 14:42:43 +1000
+
 bicyclerepair (0.9-4.3) unstable; urgency=low
 
   * NMU. Rebuild to move files to /usr/share/pyshared. Closes: #490451.
only in patch2:
unchanged:
--- bicyclerepair-0.9.orig/ide-integration/bikeemacs.py
+++ bicyclerepair-0.9/ide-integration/bikeemacs.py
@@ -64,7 +64,7 @@
         lisp("""
         (defvar brm-menu nil "Menu for Bicycle Repair Man")
          (easy-menu-define
-          brm-menu py-mode-map "Bicycle Repair Man"
+          brm-menu python-mode-map "Bicycle Repair Man"
           '("BicycleRepairMan"
                    "Queries"
                    ["Find-References" brm-find-references]
only in patch2:
unchanged:
--- bicyclerepair-0.9.orig/debian/vim-python_bike.yaml
+++ bicyclerepair-0.9/debian/vim-python_bike.yaml
@@ -0,0 +1,4 @@
+addon: python_bike
+description: Python refactoring tool
+files:
+  - ftplugin/python_bike.vim