diff -u bip-0.7.4/debian/control bip-0.7.4/debian/control
--- bip-0.7.4/debian/control
+++ bip-0.7.4/debian/control
@@ -1,14 +1,15 @@
 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.8.0
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.2), bison, flex, libssl-dev, quilt
 Homepage: http://bip.t1r.net
 
 Package: bip
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (>= 3.0-6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (>= 3.2-14)
 Description: multiuser irc proxy with conversation replay and more
  Bip is a IRC proxy that supports replaying logged conversation when a client
  connects, multiple clients on one irc server connection, It has a handy
diff -u bip-0.7.4/debian/changelog bip-0.7.4/debian/changelog
--- bip-0.7.4/debian/changelog
+++ bip-0.7.4/debian/changelog
@@ -1,9 +1,24 @@
+bip (0.7.4-2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #295688):
+    - debian/control: Depend on lsb-base >= 3.2-14, providing status_of_proc().
+    - debian/bip.init: Add the 'status' action.
+
+ -- Nick Ellery <nick.ellery@ubuntu.com>  Wed, 05 Nov 2008 03:48:15 +0000
+
 bip (0.7.4-2) unstable; urgency=low
 
   * Add bip-fix-privmsg.patch (Closes: #503253).
 
  -- Arnaud Cornet <acornet@debian.org>  Fri, 24 Oct 2008 08:55:11 +0200
 
+bip (0.7.4-1ubuntu1) intrepid; urgency=low
+
+  * debian/control: Depend on lsb-base >= 3.2-14, providing status_of_proc().
+  * debian/bip.init: Add the 'status' action (LP: #251287).
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 23 Jul 2008 15:55:44 -0500
+
 bip (0.7.4-1) unstable; urgency=low
 
   * New Upstream Version
@@ -136,0 +152 @@
+
diff -u bip-0.7.4/debian/bip.init bip-0.7.4/debian/bip.init
--- bip-0.7.4/debian/bip.init
+++ bip-0.7.4/debian/bip.init
@@ -96,8 +96,16 @@
 	2) log_end_msg 1 ;;
 	esac
 ;;
+status)
+	# /var/run/bip/bip.pid is perm'd 600, so only use -p if readable
+	if [ -r "$PIDFILE" ]; then
+		status_of_proc -p "$PIDFILE" "$BIP" bip && exit 0 || exit $?
+	else
+		status_of_proc "$BIP" bip && exit 0 || exit $?
+	fi
+;;
 *)
-	echo "Usage: /etc/init.d/bip {start|stop|reload|restart}"
+	echo "Usage: /etc/init.d/bip {start|stop|reload|restart|status}"
 	exit 3
 ;;
 esac