diff -Nru thunderbird-56.0~b4+build5/debian/changelog thunderbird-56.0~b4+build5/debian/changelog
--- thunderbird-56.0~b4+build5/debian/changelog	2017-09-22 06:18:29.000000000 +0000
+++ thunderbird-56.0~b4+build5/debian/changelog	2017-09-22 06:18:29.000000000 +0000
@@ -1,4 +1,4 @@
-thunderbird (1:56.0~b4+build5-0ubuntu0.17.04.3) zesty; urgency=medium
+thunderbird (1:56.0~b4+build5-0ubuntu0.17.04.5) zesty; urgency=medium
 
   [ Rico Tzschichholz ]
   * New upstream release from the beta channel (THUNDERBIRD_56_0b4_BUILD5)
@@ -11,7 +11,7 @@
   * Hopefully fix LP: #1711337 by building the armhf build with
     -fno-schedule-insns to work around a compiler bug
   * Don't pass -mfloat-abi=softfp when building webrtc on armhf
-    - add debian/patches/webrtc-dont-hardcode-softfp-on-armhf.patch
+    - add debian/patches/webrtc-fix-compiler-flags-for-armhf.patch
     - update debian/patches/series
 
  -- Rico Tzschichholz <ricotz@ubuntu.com>  Fri, 22 Sep 2017 08:18:29 +0200
diff -Nru thunderbird-56.0~b4+build5/debian/patches/series thunderbird-56.0~b4+build5/debian/patches/series
--- thunderbird-56.0~b4+build5/debian/patches/series	2017-09-22 06:18:29.000000000 +0000
+++ thunderbird-56.0~b4+build5/debian/patches/series	2017-09-22 06:18:29.000000000 +0000
@@ -23,4 +23,4 @@
 dont-install-blessings-from-network.patch
 restore-l10n-merge-target.patch
 rust-drop-dll-checksums.patch
-webrtc-dont-hardcode-softfp-on-armhf.patch
+webrtc-fix-compiler-flags-for-armhf.patch
diff -Nru thunderbird-56.0~b4+build5/debian/patches/webrtc-dont-hardcode-softfp-on-armhf.patch thunderbird-56.0~b4+build5/debian/patches/webrtc-dont-hardcode-softfp-on-armhf.patch
--- thunderbird-56.0~b4+build5/debian/patches/webrtc-dont-hardcode-softfp-on-armhf.patch	2017-09-22 06:18:29.000000000 +0000
+++ thunderbird-56.0~b4+build5/debian/patches/webrtc-dont-hardcode-softfp-on-armhf.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-# Description: Don't pass -mfloat-abi=softfp on armhf
-# Author: Chris Coulson <chris.coulson@canonical.com>
-# Forwarded: no
-
---- a/mozilla/media/webrtc/trunk/webrtc/build/common.gypi
-+++ b/mozilla/media/webrtc/trunk/webrtc/build/common.gypi
-@@ -434,8 +434,7 @@
-             'defines': ['WEBRTC_ARCH_ARM_V7',
-                         'WEBRTC_BUILD_NEON_LIBS',
-                         'WEBRTC_HAS_NEON'],
--            'cflags_mozilla': ['-mfloat-abi=softfp',
--                               '-mfpu=neon'],
-+            'cflags_mozilla': ['-mfpu=neon'],
-           }],
-         ],
-       }],
diff -Nru thunderbird-56.0~b4+build5/debian/patches/webrtc-fix-compiler-flags-for-armhf.patch thunderbird-56.0~b4+build5/debian/patches/webrtc-fix-compiler-flags-for-armhf.patch
--- thunderbird-56.0~b4+build5/debian/patches/webrtc-fix-compiler-flags-for-armhf.patch	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-56.0~b4+build5/debian/patches/webrtc-fix-compiler-flags-for-armhf.patch	2017-09-22 06:18:29.000000000 +0000
@@ -0,0 +1,37 @@
+# Description: Don't pass -mfloat-abi=softfp on armhf
+# Author: Chris Coulson <chris.coulson@canonical.com>
+# Forwarded: no
+
+--- a/mozilla/media/webrtc/trunk/webrtc/build/common.gypi
++++ b/mozilla/media/webrtc/trunk/webrtc/build/common.gypi
+@@ -434,8 +434,7 @@
+             'defines': ['WEBRTC_ARCH_ARM_V7',
+                         'WEBRTC_BUILD_NEON_LIBS',
+                         'WEBRTC_HAS_NEON'],
+-            'cflags_mozilla': ['-mfloat-abi=softfp',
+-                               '-mfpu=neon'],
++            'cflags_mozilla': ['-mfpu=neon'],
+           }],
+         ],
+       }],
+--- a/mozilla/build/gyp.mozbuild
++++ b/mozilla/build/gyp.mozbuild
+@@ -107,9 +107,15 @@
+         gyp_vars['arm_neon'] = 1
+         gyp_vars['build_with_neon'] = 1
+     else:
+-        # CPU detection for ARM works on Android only.  armv7 always uses CPU
+-        # detection, so we have to set armv7=0 for non-Android target
+-        gyp_vars['armv7'] = 0
++        gyp_vars['armv7'] = 1
++        # We enable NEON for Ubuntu armhf. Note that these don't really
++        # have any effect here as NEON is hardcoded on in
++        # media/webrtc/trunk/webrtc/build/common.gypi. Disabling these
++        # without fixing that file will result in a link failure, as
++        # targets hidden behind the build_with_neon flag don't get
++        # built but WEBRTC_HAS_NEON is still defined
++        gyp_vars['arm_neon'] = 1
++        gyp_vars['build_with_neon'] = 1
+     # For libyuv
+     gyp_vars['arm_version'] = int(CONFIG['ARM_ARCH'])
+