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
@@ -1,6 +1,12 @@
 #! /bin/sh
-#
-# tspc	Script to configure the IPv6 tunnel to tspc
+### BEGIN INIT INFO
+# Provides:          tspc
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
+# Default-Start:     S
+# Default-Stop:      0 6
+# Short-Description: Script to configure the IPv6 tunnel to tspc
+### END INIT INFO
 #
 #	Written by Martin Waitz <tali@debian.org>
 
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,19 @@
+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.
+  * Add LSB dependency header to init.d scripts (Closes: #467540).
+
+ -- 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-