diff -Nru qpid-cpp-0.16/debian/changelog qpid-cpp-0.16/debian/changelog
--- qpid-cpp-0.16/debian/changelog	2014-10-25 12:38:02.000000000 +0000
+++ qpid-cpp-0.16/debian/changelog	2014-10-26 11:43:53.000000000 +0000
@@ -1,3 +1,10 @@
+qpid-cpp (0.16-9) unstable; urgency=medium
+
+  * Update package sections to match override.
+  * Make libibverbs-dev build-dependency linux-any.
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Sun, 26 Oct 2014 07:22:52 +0000
+
 qpid-cpp (0.16-8) unstable; urgency=low
 
   * Add Japanese Debconf translation (closes: #692839).
diff -Nru qpid-cpp-0.16/debian/control qpid-cpp-0.16/debian/control
--- qpid-cpp-0.16/debian/control	2014-10-25 11:55:15.000000000 +0000
+++ qpid-cpp-0.16/debian/control	2014-10-26 11:46:15.000000000 +0000
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
-Build-Depends: debhelper (>= 8.9.0~), autotools-dev, autoconf (>= 2.61), automake (>= 1.9.6), libtool (>= 1.5.22), libboost-all-dev (>= 1.35), ruby, ruby-dev, uuid-dev, libsasl2-dev, libxqilla-dev (>= 2.0.0), libibverbs-dev, librdmacm-dev, libnspr4-dev, libnss3-dev, libssl-dev, sasl2-bin, libxerces-c-dev (>= 2.7.0), swig (>= 1.3.35), python (>= 2.6.6-3~), doxygen, help2man, valgrind [any-i386 any-amd64 arm], zip, procps, libnss3-tools, pkg-config, python-qpid, libperl-dev, dh-autoreconf, dpkg-dev (>= 1.16.1~), chrpath
+Build-Depends: debhelper (>= 8.9.0~), autotools-dev, autoconf (>= 2.61), automake (>= 1.9.6), libtool (>= 1.5.22), libboost-all-dev (>= 1.35), ruby, ruby-dev, uuid-dev, libsasl2-dev, libxqilla-dev (>= 2.0.0), libibverbs-dev [linux-any], librdmacm-dev, libnspr4-dev, libnss3-dev, libssl-dev, sasl2-bin, libxerces-c-dev (>= 2.7.0), swig (>= 1.3.35), python (>= 2.6.6-3~), doxygen, help2man, valgrind [any-i386 any-amd64 arm], zip, procps, libnss3-tools, pkg-config, python-qpid, libperl-dev, dh-autoreconf, dpkg-dev (>= 1.16.1~), chrpath
 X-Python-Version: 2.7
 Standards-Version: 3.9.6
 Homepage: http://qpid.apache.org
@@ -35,6 +35,7 @@
 
 Package: libqmf1
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: multiarch-support
 Multi-Arch: same
@@ -62,6 +63,7 @@
 
 Package: libqmf2-1
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: multiarch-support
 Multi-Arch: same
@@ -89,6 +91,7 @@
 
 Package: libqmfconsole2
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: multiarch-support
 Multi-Arch: same
@@ -115,6 +118,7 @@
 
 Package: libqpidmessaging2
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: multiarch-support
 Multi-Arch: same
@@ -141,6 +145,7 @@
 
 Package: libsslcommon2
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: multiarch-support
 Multi-Arch: same
@@ -167,6 +172,7 @@
 
 Package: librdmawrap2
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: multiarch-support
 Multi-Arch: same
@@ -193,6 +199,7 @@
 
 Package: libqpidtypes1
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: multiarch-support
 Multi-Arch: same
@@ -219,6 +226,7 @@
 
 Package: libqpidcommon2
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: multiarch-support
 Multi-Arch: same
@@ -245,6 +253,7 @@
 
 Package: libqpidclient2
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: multiarch-support
 Multi-Arch: same
@@ -271,6 +280,7 @@
 
 Package: libqpidbroker2
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: multiarch-support
 Multi-Arch: same
@@ -297,6 +307,7 @@
 
 Package: libqmfengine1
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: multiarch-support
 Multi-Arch: same