diff --git a/debian/changelog b/debian/changelog
index e9fa8e1a5b7faf473875d1291756048489ea91e5..7eccd1f38b8dbbc9109e557d0da9675620531786 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+i2p (0.8.6-6~build9) UNRELEASED; urgency=low
+
+  * Ship own router.config with router.updatesDisabled=true to prevent
+    upgrades to be performed by the router itself. Upgrades *must* take place
+    via the package manager.
+
+ -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 27 May 2011 17:33:21 +0000
+
 i2p (0.8.6-5) stable; urgency=low
 
   * Remove /etc/i2p/wrapper.service. Changes have been moved to the
diff --git a/debian/i2p-router.install b/debian/i2p-router.install
index 9d2f2fb142396b0228b2dc652a6bde24c93575d4..f66ecda3eb0ffb3033a185e3327406814b135936 100644
--- a/debian/i2p-router.install
+++ b/debian/i2p-router.install
@@ -11,6 +11,7 @@ pkg-temp/i2prouter-nowrapper usr/bin
 pkg-temp/i2psnark.config usr/share/i2p
 pkg-temp/i2ptunnel.config usr/share/i2p
 pkg-temp/lib/*.jar usr/share/i2p/lib
+pkg-temp/router.config usr/share/i2p
 pkg-temp/systray.config usr/share/i2p
 pkg-temp/webapps usr/share/i2p
 pkg-temp/*.xml usr/share/i2p
diff --git a/debian/rules b/debian/rules
index b914edf02922e18745a6cc9388556ca8d8f4f0f4..d690bd998f9fb0b13eb9b74e487e1e1b000d2ccc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,7 @@ build-indep:
 	# The next line is used by KYTV when building from source packages
 	#[ -r jetty/jetty-5.1.15.tgz ] && ln -sf $(CURDIR)/jetty/jetty-5.1.15.tgz $(CURDIR)/apps/jetty/jetty-5.1.15.tgz
 	ant preppkg-linux javadoc
+	echo router.updateDisabled=true > $(I2P)/router.config
 	mv build/javadoc build/api
 	mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
 	-cp -fv /usr/share/tor/geoip $(CURDIR)/pkg-temp/geoip/geoip.txt