diff -u linux86-0.16.17/debian/rules linux86-0.16.17/debian/rules
--- linux86-0.16.17/debian/rules
+++ linux86-0.16.17/debian/rules
@@ -63,7 +63,7 @@
 # ``bcc'' specific things:
 		install -d debian/tmp-bcc/usr/bin
 		mv debian/tmp/usr/bin/bcc debian/tmp-bcc/usr/bin
-ifneq (,$(filter $(DEB_BUILD_ARCH),i386 lpia))
+ifeq ($(findstring i486-linux-gnu,$(DEB_BUILD_GNU_TYPE)),i486-linux-gnu)
 		mv debian/tmp/usr/bin/elksemu debian/tmp-bcc/usr/bin
 		install -d debian/tmp-bcc/usr/share/man/man1
 		mv debian/tmp/usr/man/man1/elksemu.1.gz debian/tmp-bcc/usr/share/man/man1
diff -u linux86-0.16.17/debian/control linux86-0.16.17/debian/control
--- linux86-0.16.17/debian/control
+++ linux86-0.16.17/debian/control
@@ -1,7 +1,7 @@
 Source: linux86
 Section: devel
 Priority: optional
-Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Juan Cespedes <cespedes@debian.org>
 Standards-Version: 3.8.0
 
diff -u linux86-0.16.17/debian/changelog linux86-0.16.17/debian/changelog
--- linux86-0.16.17/debian/changelog
+++ linux86-0.16.17/debian/changelog
@@ -1,3 +1,20 @@
+linux86 (0.16.17-3.1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: (LP: #704233)
+    - bcc/bcc.c: correctly calculate MAXPATHLEN to avoid runtime fortify
+      failures and FTBFS. (Closes: #523807)
+  * debian/rules: Drop build lpia, this change is obsolete and doesn't work.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Tue, 18 Jan 2011 01:35:52 +0100
+
+linux86 (0.16.17-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: ncc: illegal label": apply patch by dai that replaces strcpy
+    by memmove (closes: #591133).
+
+ -- gregor herrmann <gregoa@debian.org>  Thu, 11 Nov 2010 22:29:38 +0100
+
 linux86 (0.16.17-3ubuntu2) jaunty; urgency=low
 
   * bcc/bcc.c: correctly calculate MAXPATHLEN to avoid runtime fortify
@@ -352 +368,0 @@
-
only in patch2:
unchanged:
--- linux86-0.16.17.orig/copt/copt.c
+++ linux86-0.16.17/copt/copt.c
@@ -174,7 +174,7 @@
   /* Delete leading white spaces */
   for (cp = buf; *cp && isspace(*cp); cp++) ;
   if (cp != buf && *cp)
-	strcpy(buf, cp);
+	memmove(buf, cp, strlen(cp) + 1);
 
   return(buf);
 }