diff -u tspc-2.1.1/debian/control tspc-2.1.1/debian/control
--- tspc-2.1.1/debian/control
+++ tspc-2.1.1/debian/control
@@ -1,7 +1,8 @@
 Source: tspc
 Section: net
 Priority: optional
-Maintainer: Anand Kumria <wildfire@progsoc.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Anand Kumria <wildfire@progsoc.org>
 Build-Depends: cdbs, debhelper (>= 4.1.68)
 Standards-Version: 3.6.2.1
 
diff -u tspc-2.1.1/debian/changelog tspc-2.1.1/debian/changelog
--- tspc-2.1.1/debian/changelog
+++ tspc-2.1.1/debian/changelog
@@ -1,3 +1,12 @@
+tspc (2.1.1-6.1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #239196):
+    - Make sure ipv6 module is loaded. (LP: #19559)
+    - debian/control: Update maintainer fields according to debian-
+      maintainer-field spec.
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Wed, 11 Jun 2008 09:53:20 -0500
+
 tspc (2.1.1-6.1) unstable; urgency=low
 
   * Non-maintainer upload to fix RC bug.
@@ -5,6 +14,20 @@
 
  -- Petter Reinholdtsen <pere@debian.org>  Mon, 31 Mar 2008 00:17:51 +0200
 
+tspc (2.1.1-6ubuntu2) gutsy; urgency=low
+
+  * debian/control: Update maintainer fields according to debian-
+    maintainer-field spec.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 15 Aug 2007 08:10:37 +0000
+
+tspc (2.1.1-6ubuntu1) dapper; urgency=low
+
+  * Make sure ipv6 module is loaded.
+  (Closes Ubuntu: #19559)
+
+ -- Fabio M. Di Nitto <fabbione@ubuntu.com>  Fri, 31 Mar 2006 09:04:35 +0200
+
 tspc (2.1.1-6) unstable; urgency=high
 
   * Don't install crap all over the filesystem (Closes: #336980)
diff -u tspc-2.1.1/debian/tspc.init tspc-2.1.1/debian/tspc.init
--- tspc-2.1.1/debian/tspc.init
+++ tspc-2.1.1/debian/tspc.init
@@ -15,6 +15,8 @@
 
 test -f $TSPC || exit 0
 
+# make sure ipv6 module is loaded.
+modprobe ipv6 > /dev/null 2>&1
 
 # read tsp client config, to get the interface used
 . /etc/tsp/tspc.conf