diff -pruN 1.8.3-1/debian/changelog 1.8.3-1ubuntu1/debian/changelog
--- 1.8.3-1/debian/changelog	2011-10-28 15:52:25.000000000 +0000
+++ 1.8.3-1ubuntu1/debian/changelog	2011-10-28 15:52:26.000000000 +0000
@@ -1,3 +1,10 @@
+xorp (1.8.3-1ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    + Build with -U_FORTIFY_SOURCE instead of -D_FORTIFY_SOURCE=0
+
+ -- Stephan Adig <sh@sourcecode.de>  Fri, 28 Oct 2011 11:35:51 +0000
+
 xorp (1.8.3-1) unstable; urgency=low
 
   * Updated manpages with the new options.
@@ -6,6 +13,13 @@ xorp (1.8.3-1) unstable; urgency=low
 
  -- Jose Calhariz <jose.calhariz@tagus.ist.utl.pt>  Sun, 21 Aug 2011 21:27:11 +0100
 
+xorp (1.8.3-1~wip5ubuntu1) oneiric; urgency=low
+
+  * Build with -U_FORTIFY_SOURCE instead of -D_FORTIFY_SOURCE=0. LP: #832788.
+  * Build for all architectures.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 16 Sep 2011 18:56:25 +0200
+
 xorp (1.8.3-1~wip5) experimental; urgency=low
 
   * New upstream release.
diff -pruN 1.8.3-1/debian/control 1.8.3-1ubuntu1/debian/control
--- 1.8.3-1/debian/control	2011-10-28 15:52:25.000000000 +0000
+++ 1.8.3-1ubuntu1/debian/control	2011-10-28 15:52:26.000000000 +0000
@@ -14,7 +14,7 @@ Vcs-Svn: svn://svn.debian.org/pkg-xorp/t
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-xorp/trunk/xorp/
 
 Package: xorp
-Architecture: amd64 s390 powerpc i386
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>= 3.11), 
 Recommends: iputils-ping, traceroute, iputils-tracepath 
 Description: eXtensible Open Router Platform
diff -pruN 1.8.3-1/debian/patches/gcc_u_fortify_source 1.8.3-1ubuntu1/debian/patches/gcc_u_fortify_source
--- 1.8.3-1/debian/patches/gcc_u_fortify_source	1970-01-01 00:00:00.000000000 +0000
+++ 1.8.3-1ubuntu1/debian/patches/gcc_u_fortify_source	2011-10-28 15:52:26.000000000 +0000
@@ -0,0 +1,18 @@
+--- xorp-1.8.3.orig/SConstruct
++++ xorp-1.8.3/SConstruct
+@@ -797,9 +797,12 @@
+ 
+ # Forcibly disable GCC's SSP support., as it may be incompatible
+ # with the XORP code base.
+-env.AppendUnique(CPPDEFINES = [
+-    ( '_FORTIFY_SOURCE', 0 ),
+-    ])
++env.AppendUnique(CFLAGS = [
++	'-U_FORTIFY_SOURCE',
++	])
++env.AppendUnique(CXXFLAGS = [
++	'-U_FORTIFY_SOURCE',
++	])
+ 
+ if env['enable_boost']:
+     # Forcibly disable Boost's thread support; the XORP code base is
diff -pruN 1.8.3-1/debian/patches/series 1.8.3-1ubuntu1/debian/patches/series
--- 1.8.3-1/debian/patches/series	2011-10-28 15:52:25.000000000 +0000
+++ 1.8.3-1ubuntu1/debian/patches/series	2011-10-28 15:52:26.000000000 +0000
@@ -19,3 +19,5 @@ ftbfs_gcc-4.6_-Werror_ospf
 
 ftbfs_gcc-4.6_-Werror_check_libxorp
 ftbfs_gcc-4.6_-Werror_check_ospf
+
+gcc_u_fortify_source