diff -u bip-0.6.1/debian/bip.default bip-0.6.1/debian/bip.default
--- bip-0.6.1/debian/bip.default
+++ bip-0.6.1/debian/bip.default
@@ -2 +2 @@
-ENABLED=0
+ENABLED=1
diff -u bip-0.6.1/debian/changelog bip-0.6.1/debian/changelog
--- bip-0.6.1/debian/changelog
+++ bip-0.6.1/debian/changelog
@@ -1,3 +1,16 @@
+bip (0.6.1-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    + debian/bip.default: Change ENABLED to 1 (LP: #105199)
+      - Init script now starts bip without user intervention.
+    + debian/bip.postinst:
+      - Remove "if" block from postinst that prevented the
+        0.5.3-4 patch from being applied on an "upgrade".
+      - Add a call to update-rc.d
+    + Change Maintainer to match the DebianMaintainerField Spec.
+
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <sgevatter@ubuntu.cat>  Sun, 28 Oct 2007 09:56:12 +0100
+
 bip (0.6.1-1) unstable; urgency=low
 
   * New Upstream Version.
@@ -5,6 +18,16 @@
 
  -- Arnaud Cornet <acornet@debian.org>  Sun, 19 Aug 2007 18:55:55 +0200
 
+bip (0.6.0-2ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    + debian/bip.default: Change ENABLED to 1 (Closes LP: #105199)
+      - Init script now starts bip without user intervention.
+    + debian/bip.postinst: Remove "if" block from postinst that
+      prevented the 0.5.3-4 patch from being applied on an "upgrade".
+
+ -- Zak B. Elep <zakame@spunge.org>  Tue, 12 Jun 2007 14:33:10 +0000
+
 bip (0.6.0-2) unstable; urgency=low
 
   * Cleanup sample conf file.
@@ -16,6 +39,16 @@
 
  -- Arnaud Cornet <arnaud.cornet@gmail.com>  Mon, 04 Jun 2007 19:51:45 +0200
 
+bip (0.6.0-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    + debian/bip.default: Change ENABLED to 1 (Closes LP: #105199)
+      - Init script now starts bip without user intervention.
+    + debian/bip.postinst: Remove "if" block from postinst that
+      prevented the 0.5.3-4 patch from being applied on an "upgrade".
+
+ -- Stephan Hermann <sh@sourcecode.de>  Fri,  4 May 2007 15:51:54 +0200
+
 bip (0.6.0-1) unstable; urgency=low
 
   * Fix typo (Closes: 416074).
@@ -30,6 +63,16 @@
 
  -- Arnaud Cornet <arnaud.cornet@gmail.com>  Tue, 01 May 2007 12:40:23 +0200
 
+bip (0.5.3-4ubuntu1) feisty; urgency=high
+
+  * debian/bip.default: Change ENABLED to 1 (Closes LP: #105199)
+    - Init script now starts bip without user intervention.
+  * debian/bip.postinst: Remove "if" block from postinst that
+    prevented the 0.5.3-4 patch from being applied on an "upgrade".
+  * debian/control: Adhere to DebianMaintainerField.
+
+ -- xtknight <xt.knight@gmail.com>  Tue, 10 Apr 2007 12:39:00 -0400
+
 bip (0.5.3-4) unstable; urgency=high
 
   * Set proper permissions in postinst (Closes: #415855).
@@ -92,0 +136 @@
+
diff -u bip-0.6.1/debian/control bip-0.6.1/debian/control
--- bip-0.6.1/debian/control
+++ bip-0.6.1/debian/control
@@ -1,7 +1,8 @@
 Source: bip
 Section: net
 Priority: optional
-Maintainer: Arnaud Cornet <acornet@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Arnaud Cornet <acornet@debian.org>
 Standards-Version: 3.7.2
 Build-Depends: cdbs, debhelper (>= 5.0.37.2), bison, flex, libssl-dev
 
diff -u bip-0.6.1/debian/bip.postinst bip-0.6.1/debian/bip.postinst
--- bip-0.6.1/debian/bip.postinst
+++ bip-0.6.1/debian/bip.postinst
@@ -20,8 +20,10 @@
 
-if [ "$1" = "configure" -a "$2" = "" ]
+if [ -x /usr/sbin/update-rc.d ]
 then
-	chown root:"$BIPGROUP" /etc/bip.conf
-	chmod 640 /etc/bip.conf
+	/usr/sbin/update-rc.d bip defaults
 fi
 
+chown root:"$BIPGROUP" /etc/bip.conf
+chmod 640 /etc/bip.conf
+
 #DEBHELPER#