diff -u lshw-02.18/debian/changelog lshw-02.18/debian/changelog
--- lshw-02.18/debian/changelog
+++ lshw-02.18/debian/changelog
@@ -1,3 +1,34 @@
+lshw (02.18-0.1ubuntu1) yakkety; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/Parse-OPAL-firmware-properties-from-the-device-tree.patch:
+      include support for displaying OPAL information on PowerNV systems.
+  * Dropped changes, included in Debian:
+    - debian/patches/fix-width-handling.patch: Fix regression in detecting
+      platform width.
+    - debian/patches/Avoid-crash-in-scan_dmi_sysfs-when-running-as-non-ro.patch:
+      Fix a regression that causes lshw to crash when running unprivileged
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 21 Aug 2016 22:07:06 -0700
+
+lshw (02.18-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload with permission of the maintainer.
+  * New upstream release.  Closes: #823639, #756921, #746616, #758550,
+    #767023.
+    - Refresh patches for unfortunate new upstream tarball layout.
+    - debian/patches/fat-inspection.patch, debian/patches/smbios-noscan.patch:
+      drop, fixed upstream.
+    - Drop debian/patches/sparc.patch: no longer applies cleanly, and is
+      incorrect (double header inclusion).
+  * debian/patches/Avoid-crash-in-scan_dmi_sysfs-when-running-as-non-ro.patch:
+    patch taken from Ubuntu to fix an upstream regression when running as
+    non-root; thanks to dann frazier <dann.frazier@canonical.com>
+  * debian/patches/fix-width-handling.patch: Fix regression in detecting
+    platform width.
+
+ -- Steve Langasek <vorlon@debian.org>  Mon, 15 Aug 2016 13:42:04 -0700
+
 lshw (02.18-0ubuntu1) yakkety; urgency=medium
 
   * New upstream release.  Closes: #823639, #756921, #746616, #758550.
@@ -362,0 +394 @@
+
diff -u lshw-02.18/debian/patches/fix-width-handling.patch lshw-02.18/debian/patches/fix-width-handling.patch
--- lshw-02.18/debian/patches/fix-width-handling.patch
+++ lshw-02.18/debian/patches/fix-width-handling.patch
@@ -4,6 +4,7 @@
  actually query with _SC_LONG_BIT and get a correct answer, instead of
  always getting -1 bits as our answer.
 Author: Steve Langasek <steve.langasek@canonical.com>
+Forwarded-Upstream: not-needed
 
 Index: lshw-02.18/lshw-B.02.18/src/core/abi.cc
 ===================================================================
diff -u lshw-02.18/debian/patches/series lshw-02.18/debian/patches/series
--- lshw-02.18/debian/patches/series
+++ lshw-02.18/debian/patches/series
@@ -1,4 +1,3 @@
-fix-width-handling.patch
 wget.patch
 bin.patch
 lshw-gtk.patch
@@ -13,2 +12,3 @@
 Avoid-crash-in-scan_dmi_sysfs-when-running-as-non-ro.patch
+fix-width-handling.patch
 Parse-OPAL-firmware-properties-from-the-device-tree.patch