diff -u scponly-4.6/debian/control scponly-4.6/debian/control
--- scponly-4.6/debian/control
+++ scponly-4.6/debian/control
@@ -1,7 +1,8 @@
 Source: scponly
 Section: utils
 Priority: optional
-Maintainer: Thomas Wana <greuff@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Thomas Wana <greuff@debian.org>
 Build-Depends: debhelper (>= 4.1.16), rsync, ssh, unison, subversion
 Standards-Version: 3.6.1.0
 
diff -u scponly-4.6/debian/changelog scponly-4.6/debian/changelog
--- scponly-4.6/debian/changelog
+++ scponly-4.6/debian/changelog
@@ -1,3 +1,10 @@
+scponly (4.6-1.4ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #295411):
+    - Patch setup_chroot.sh.in so that dev/null gets created in the chroot.
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Fri, 07 Nov 2008 21:18:21 -0600
+
 scponly (4.6-1.4) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -7,6 +14,17 @@
 
  -- Christian Perrier <bubulle@debian.org>  Sun, 21 Sep 2008 08:39:28 +0200
 
+scponly (4.6-1.3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #239208):
+    - patched setup_chroot.sh.in so that dev/null get's created in the chroot.
+      OpenSSH for scponly requires a dev/null in the execution environment,
+      this was not the fact in the past and may change in the future.
+    - changed Maintainer-Field to MOTU and introduced XSBC-Original-Maintainer
+      with former maintainer.
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Wed, 11 Jun 2008 10:21:31 -0500
+
 scponly (4.6-1.3) unstable; urgency=low
 
   * Non-maintainer upload to fix pending l10n issues.
@@ -21,6 +39,16 @@
 
  -- Christian Perrier <bubulle@debian.org>  Fri, 16 May 2008 23:28:10 +0200
 
+scponly (4.6-1.2ubuntu1) hardy; urgency=low
+
+  * patched setup_chroot.sh.in so that dev/null get's created in the chroot
+    (LP: #191422). OpenSSH for scponly requires a dev/null in the execution
+    enviroment, this was not the fact in the past and may change in the future.
+  * changed Maintainer-Field to MOTU and introduced XSBC-Original-Maintainer
+    with former maintainer.
+
+ -- Albrecht Mühlenschulte <albrecht@a7p.org>  Fri, 15 Feb 2008 16:06:01 +0100
+
 scponly (4.6-1.2) unstable; urgency=high
   
   * Non-maintainer upload by the Security Team
only in patch2:
unchanged:
--- scponly-4.6.orig/setup_chroot.sh.in
+++ scponly-4.6/setup_chroot.sh.in
@@ -199,6 +199,10 @@
 	done
 fi
 
+# /dev/null is neede inside the chroot
+mkdir -p $targetdir/dev
+mknod -m 666 $targetdir/dev/null c 1 3
+
 if [ "x$USE_PW" = x0 ] ; then
     @PROG_USERADD@ -d "$targetdir" -s "@prefix@/sbin/@CHROOTED_NAME@" $targetuser
     if [ $? -ne 0 ]; then