diff -Nru firefox-36.0+build2/debian/changelog firefox-36.0+build2/debian/changelog
--- firefox-36.0+build2/debian/changelog	2015-02-24 10:13:51.000000000 +0000
+++ firefox-36.0+build2/debian/changelog	2015-02-24 12:47:47.000000000 +0000
@@ -1,4 +1,4 @@
-firefox (36.0+build2-0ubuntu0.14.04.3) trusty-security; urgency=medium
+firefox (36.0+build2-0ubuntu0.14.04.4) trusty-security; urgency=medium
 
   * New upstream stable release (FIREFOX_36_0_BUILD2)
     - see USN-2505-1
@@ -35,6 +35,9 @@
     a codegen
     - add debian/patches/fix-ion-ftbfs.patch
     - update debian/patches/series
+  * Backport patch to fix a build failure in some unified builds
+    - add debian/patches/fix-unified-ftbfs.patch
+    - update debian/patches/series
 
  -- Chris Coulson <chris.coulson@canonical.com>  Mon, 23 Feb 2015 14:03:16 +0000
 
diff -Nru firefox-36.0+build2/debian/patches/fix-unified-ftbfs.patch firefox-36.0+build2/debian/patches/fix-unified-ftbfs.patch
--- firefox-36.0+build2/debian/patches/fix-unified-ftbfs.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-36.0+build2/debian/patches/fix-unified-ftbfs.patch	2015-02-24 12:47:47.000000000 +0000
@@ -0,0 +1,12 @@
+# Description: undef CONST to fix problems in some unified builds
+# Origin: http://hg.mozilla.org/releases/mozilla-beta/rev/61d908954a18
+
+Index: firefox-36.0+build2/js/src/dtoa.c
+===================================================================
+--- firefox-36.0+build2.orig/js/src/dtoa.c	2015-02-23 16:16:00.000000000 +0000
++++ firefox-36.0+build2/js/src/dtoa.c	2015-02-24 11:01:46.633859833 +0000
+@@ -3246,3 +3246,4 @@
+ 		*rve = s;
+ 	return s0;
+ 	}
++#undef CONST
diff -Nru firefox-36.0+build2/debian/patches/series firefox-36.0+build2/debian/patches/series
--- firefox-36.0+build2/debian/patches/series	2015-02-24 10:13:51.000000000 +0000
+++ firefox-36.0+build2/debian/patches/series	2015-02-24 12:47:47.000000000 +0000
@@ -26,3 +26,4 @@
 dont-hardcode-softfp-on-armhf.patch
 add-non-skia-fallback.patch
 fix-ion-ftbfs.patch
+fix-unified-ftbfs.patch