diff -u yaird-0.0.12/debian/mkinitrd.yaird yaird-0.0.12/debian/mkinitrd.yaird
--- yaird-0.0.12/debian/mkinitrd.yaird
+++ yaird-0.0.12/debian/mkinitrd.yaird
@@ -24,7 +24,7 @@
 PROG=mkinitrd.yaird
 outfile=''
 
-TEMP=`getopt -o d:km:o:r: --long supported-host-version:,supported-target-version: -n "$PROG" -- "$@"`
+TEMP=`getopt -o cd:k:m:o:r:u --long supported-host-version:,supported-target-version: -n "$PROG" -- "$@"`
 
 # Check for non-GNU getopt
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@@ -33,13 +33,17 @@
 
 while true ; do
 	case "$1" in
+	-c)
+		# ignore
+		shift 1
+		;;
 	-d)
 		echo "$PROG: $1 unsupported" >&2
 		exit 1
 		;;
 	-k)
-		echo "$PROG: $1 unsupported" >&2
-		exit 1
+		VERSION="$2"
+		shift 2
 		;;
 	-m)
 		# ignore
@@ -53,6 +57,10 @@
 		echo "$PROG: $1 unsupported" >&2
 		exit 1
 		;;
+	-u)
+		# ignore
+		shift 1
+		;;
 	--supported-host-version)
 		supported_host_version="$2"
 		shift 2
@@ -88,9 +96,11 @@
 	exit 0
 fi
 
+if [ "$VERSION" = "" ]; then
+	VERSION="$1"
+fi
 if [ "$outfile" = "" ]; then
-	echo "$PROG: no output file specified" >&2
-	exit 1
+	outfile=/boot/initrd.img-$VERSION
 fi
 if [ $# -gt 1 ]; then
 	echo "$PROG: extra arguments found" >&2
@@ -99,7 +109,6 @@
 
 # Note that version may be a pathname;
 # this is used by the installer for Debian kernel image packages.
-VERSION="$1"
 [ $# -gt 0 ] || unset VERSION
 case "$VERSION" in
 /lib/modules/*/[!/]*)
@@ -121,2 +130,6 @@
 
+if [ -f $outfile ]; then
+	rm $outfile
+fi
+
 exec /usr/sbin/yaird --output "$outfile" "$VERSION"
diff -u yaird-0.0.12/debian/changelog yaird-0.0.12/debian/changelog
--- yaird-0.0.12/debian/changelog
+++ yaird-0.0.12/debian/changelog
@@ -1,3 +1,15 @@
+yaird (0.0.12-23ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+        - debian/control
+            + changing maintainter to "Ubuntu MOTU Developers"
+        - debian/mkinitrd.yaird
+            + update-initramfs compatibility
+        - debian/docs
+            + docs mentions html files that now are xml
+
+ -- Andrea Gasparini <gaspa@yattaweb.it>  Sun, 21 Oct 2007 21:59:50 +0200
+
 yaird (0.0.12-23) unstable; urgency=low
 
   * Add Vcs-Svn and Vcs-Browser fields to debian/control.
@@ -14,6 +26,13 @@
 
  -- Jonas Smedegaard <dr@jones.dk>  Sat, 20 Oct 2007 13:27:08 +0200
 
+yaird (0.0.12-22ubuntu1) gutsy; urgency=low
+
+  * mkinitrd-yaird: update-initramfs compatibility (LP: #129828)
+  * Update Maintainer field in debian/control
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sun, 19 Aug 2007 23:51:27 +0200
+
 yaird (0.0.12-22) unstable; urgency=low
 
   * Brown paperbag release.
diff -u yaird-0.0.12/debian/docs yaird-0.0.12/debian/docs
--- yaird-0.0.12/debian/docs
+++ yaird-0.0.12/debian/docs
@@ -1,2 +1,2 @@
-doc/yaird.html
+doc/yaird.xml
 doc/figures/
diff -u yaird-0.0.12/debian/control yaird-0.0.12/debian/control
--- yaird-0.0.12/debian/control
+++ yaird-0.0.12/debian/control
@@ -2,7 +2,8 @@
 Section: utils
 Priority: optional
 Build-Depends: cdbs (>= 0.4.27-1), debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), dh-buildinfo, xmlto
-Maintainer: Yaird Team <yaird-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Yaird Team <yaird-devel@lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
 Vcs-Svn: svn://svn.debian.org/svn/yaird/yaird/yaird/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/yaird/yaird/yaird/trunk