diff -u eject-2.1.5/debian/control eject-2.1.5/debian/control
--- eject-2.1.5/debian/control
+++ eject-2.1.5/debian/control
@@ -2,7 +2,8 @@
 Section: utils
 Priority: optional
 Build-Depends: gettext, debhelper (>= 5), dpkg-dev (>= 1.13.2), libdevmapper-dev [!kfreebsd-i386 !kfreebsd-amd64]
-Maintainer: Frank Lichtenheld <djpig@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Frank Lichtenheld <djpig@debian.org>
 Standards-Version: 3.7.2
 Vcs-Browser: http://source.djpig.de/cvs/debian/eject/
 
diff -u eject-2.1.5/debian/changelog eject-2.1.5/debian/changelog
--- eject-2.1.5/debian/changelog
+++ eject-2.1.5/debian/changelog
@@ -1,3 +1,11 @@
+eject (2.1.5-6ubuntu1) hardy; urgency=low
+
+  * Fix problem where eject -T doesn't close the tray. (LP: #91873)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Andy Matteson <xt.knight@gmail.com>  Thu, 10 Apr 2008 01:38:05 -0400
+
 eject (2.1.5-6) unstable; urgency=low
 
   [ Frank Lichtenheld ]
diff -u eject-2.1.5/eject.c eject-2.1.5/eject.c
--- eject-2.1.5/eject.c
+++ eject-2.1.5/eject.c
@@ -544,7 +544,7 @@
 	gettimeofday(&time_start, NULL);
 	
 	/* Send the CDROMEJECT command to the device. */
-	if (ioctl(fd, CDROMEJECT, 0) < 0) {
+	if (ioctl(fd, CDROMEJECT, 0) < 0 && errno != EIO) {
 		perror("ioctl");
 		exit(1);
 	}