diff -u jabberd2-2.2.1/debian/init jabberd2-2.2.1/debian/init
--- jabberd2-2.2.1/debian/init
+++ jabberd2-2.2.1/debian/init
@@ -15,6 +15,11 @@
 
 set -e
 
+if [ ! -d "$PIDPATH" ];then
+        mkdir "$PIDPATH"
+        chown jabber:adm "$PIDPATH"
+fi
+
 case "$1" in
    start)
       echo -n "Starting Jabber services:"
diff -u jabberd2-2.2.1/debian/changelog jabberd2-2.2.1/debian/changelog
--- jabberd2-2.2.1/debian/changelog
+++ jabberd2-2.2.1/debian/changelog
@@ -1,3 +1,20 @@
+jabberd2 (2.2.1-1ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian unstable (LP: #257130), remaining changes:
+    - debian/control:
+      + Modify Maintainer field as per spec
+      + Depend on libdb4.6-dev instead of libdb4.4-dev
+      + Added Conflicts and Replaces: ..., jabber for jabberd2
+    - debian/rules: Added libtoolize call (jabberd2 ships with
+       an older ltmain.sh version that conflicts with the
+       current libtool version)
+    - debian/init: create /var/run/jabber directory with correct
+       permissions
+  * Dropped changes:
+    - Debian already depends on libpq-dev
+
+ -- Nicolai Spohrer <nicolai@xeve.de>  Tue, 12 Aug 2008 16:13:43 +0200
+
 jabberd2 (2.2.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #403750).
@@ -27,6 +44,37 @@
 
  -- Jorge Salamero Sanz <bencer@debian.org>  Thu, 17 Jul 2008 12:38:05 +0200
 
+jabberd2 (2.0s11-1ubuntu4) hardy; urgency=low
+
+  * Rebuild adainst libdb4.6 (LP: #187448) 
+
+ -- Nicolas Valcárcel <nvalcarcel@ubuntu-pe.org>  Wed, 30 Jan 2008 17:57:58 -0500
+
+jabberd2 (2.0s11-1ubuntu3) hardy; urgency=low
+
+  * Rebuild against libldap2.4-2
+
+ -- Emmet Hikory <persia@ubuntu.com>  Thu, 24 Jan 2008 21:56:43 +0900
+
+jabberd2 (2.0s11-1ubuntu2) gutsy; urgency=low
+
+  * debian/jabberd2.init: correct typo in pid directory creation
+      (LP: #147157)
+  * really modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Mon, 08 Oct 2007 00:53:24 +0200
+
+jabberd2 (2.0s11-1ubuntu1) gutsy; urgency=low
+
+  * now use Debian package in experimental (LP: #119545)
+  * debian/control: change postresql-dev in libpq-dev in build depends
+  * debian/control: adding Conflicts to jabber package
+  * debian/jabberd2.init: create /var/run/jabber directory with correct 
+    permissions
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Mon, 25 Jun 2007 16:41:27 +0200
+
 jabberd2 (2.0s11-1) experimental; urgency=low
 
   * New upstream release (closes: #357874).
diff -u jabberd2-2.2.1/debian/control jabberd2-2.2.1/debian/control
--- jabberd2-2.2.1/debian/control
+++ jabberd2-2.2.1/debian/control
@@ -1,15 +1,16 @@
 Source: jabberd2
 Section: net
 Priority: optional
-Maintainer: Jorge Salamero Sanz <bencer@debian.org>
-Build-Depends: debhelper (>= 5), dpatch, autotools-dev, automake, libtool, libssl-dev, libgsasl7-dev (> 0.2.26), libdb4.4-dev, libpam0g-dev, libmysqlclient15-dev, libpq-dev, libldap2-dev, libsqlite3-dev, libidn11-dev, libexpat1-dev, libudns-dev
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jorge Salamero Sanz <bencer@debian.org>
+Build-Depends: debhelper (>= 5), dpatch, autotools-dev, automake, libtool, libssl-dev, libgsasl7-dev (> 0.2.26), libdb4.6-dev, libpam0g-dev, libmysqlclient15-dev, libpq-dev, libldap2-dev, libsqlite3-dev, libidn11-dev, libexpat1-dev, libudns-dev
 Standards-Version: 3.8.0
 Homepage: http://jabberd2.xiaoka.com/
 
 Package: jabberd2
 Architecture: any
-Conflicts: jabberd2-bdb, jabberd2-mysql, jabberd2-pgsql, jabberd2-ldap-bdb, jabberd2-ldap-mysql, jabberd2-ldap-pgsql
-Replaces: jabberd2-bdb, jabberd2-mysql, jabberd2-pgsql, jabberd2-ldap-bdb, jabberd2-ldap-mysql, jabberd2-ldap-pgsql
+Conflicts: jabberd2-bdb, jabberd2-mysql, jabberd2-pgsql, jabberd2-ldap-bdb, jabberd2-ldap-mysql, jabberd2-ldap-pgsql, jabber
+Replaces: jabberd2-bdb, jabberd2-mysql, jabberd2-pgsql, jabberd2-ldap-bdb, jabberd2-ldap-mysql, jabberd2-ldap-pgsql, jabber
 Depends: adduser, ${shlibs:Depends}
 Description: Jabber instant messenger server 
  Jabber is a free instant messaging server based on XMPP.
diff -u jabberd2-2.2.1/debian/rules jabberd2-2.2.1/debian/rules
--- jabberd2-2.2.1/debian/rules
+++ jabberd2-2.2.1/debian/rules
@@ -28,7 +28,7 @@
 
 config.status: patch configure
 	dh_testdir
-	
+	libtoolize --force --copy
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif