diff -u ninvaders-0.1.1/debian/control ninvaders-0.1.1/debian/control
--- ninvaders-0.1.1/debian/control
+++ ninvaders-0.1.1/debian/control
@@ -1,7 +1,8 @@
 Source: ninvaders
 Section: games
 Priority: optional
-Maintainer: Matthew Palmer <mpalmer@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Matthew Palmer <mpalmer@debian.org>
 Build-Depends: debhelper (>= 4), libncurses5-dev
 Standards-Version: 3.6.0
 
diff -u ninvaders-0.1.1/debian/changelog ninvaders-0.1.1/debian/changelog
--- ninvaders-0.1.1/debian/changelog
+++ ninvaders-0.1.1/debian/changelog
@@ -1,3 +1,12 @@
+ninvaders (0.1.1-2ubuntu1) maverick; urgency=low
+
+  * Pull select changes from 0.1.1-3 (LP: #656678):
+    + Fix overflow in lowest_ship array.  Closes: #597036
+      Thanks to Matt Chapman for the bug report and patch.
+    + Enhance the copyright file.
+
+ -- Micah Gersten <micahg@ubuntu.com>  Thu, 07 Oct 2010 23:49:15 -0500
+
 ninvaders (0.1.1-2) unstable; urgency=low
 
   * Convert everything in the package to refer to the binary and related
diff -u ninvaders-0.1.1/debian/copyright ninvaders-0.1.1/debian/copyright
--- ninvaders-0.1.1/debian/copyright
+++ ninvaders-0.1.1/debian/copyright
@@ -6,4 +6,25 @@
 Copyright:
 
+From nInvaders.c:
+
+ * Copyright (C) 2002-2003 Dettus
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * homepage: http://ninvaders.sourceforge.net
+ * mailto: ninvaders-devel@lists.sourceforge.net
+
 Released under the terms of the GPL.  See /usr/share/common-licenses/GPL, or
 nInvaders -gpl.
only in patch2:
unchanged:
--- ninvaders-0.1.1.orig/aliens.c
+++ ninvaders-0.1.1/aliens.c
@@ -163,7 +163,7 @@
 	aliens.right=-1;
 	aliens.bottom=-1;
 	shipnum=0;
-	for (k=0;k<11;k++) {
+	for (k=0;k<ALIENS_MAX_NUMBER_X;k++) {
 		lowest_ship[k]=-1;
 	}