diff -u xorp-1.8.5/debian/changelog xorp-1.8.5/debian/changelog
--- xorp-1.8.5/debian/changelog
+++ xorp-1.8.5/debian/changelog
@@ -1,3 +1,10 @@
+xorp (1.8.5-2ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - arch change to all
+
+ -- Roy Jamison <xteejyx@googlemail.com>  Wed, 27 Nov 2013 15:43:26 +0000
+
 xorp (1.8.5-2) unstable; urgency=low
 
   * Remade the previous work around to build with GCC 4.7 and 4.8, now use
@@ -8,6 +15,12 @@
 
  -- Jose M Calhariz <jose.calhariz@ist.utl.pt>  Fri, 16 Aug 2013 19:51:12 +0100
 
+xorp (1.8.5-1.1ubuntu1) raring; urgency=low
+
+  * Build on all architectures again, accidentally dropped in sync.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 22 Nov 2012 11:46:33 -0700
+
 xorp (1.8.5-1.1) unstable; urgency=low
 
   * Non maintainer upload
diff -u xorp-1.8.5/debian/control xorp-1.8.5/debian/control
--- xorp-1.8.5/debian/control
+++ xorp-1.8.5/debian/control
@@ -1,7 +1,8 @@
 Source: xorp
 Section: net
 Priority: extra
-Maintainer: Jose Calhariz <jose.calhariz@tagus.ist.utl.pt>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jose Calhariz <jose.calhariz@tagus.ist.utl.pt>
 Uploaders: Javier Fernandez-Sanguino Pen~a <jfs@debian.org>
 Build-Depends: debhelper (>= 7), 
  cpp-4.6,
@@ -15,7 +16,7 @@
 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