diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index e4118f7a7b..ae9b50604a 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -7,6 +7,7 @@ SHA1 (patch-aa) = 12baede30120947ffae5cf1aed2886943548b46a
 SHA1 (patch-ao) = fd708563f119823f5634ecd57e5a2089682040e0
 SHA1 (patch-build_gyp.mozbuild) = b811edb2f76fdd241edff0b4945977c810a987b8
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = 2be8b355ef1de83371e6b3a15216b1eaf4ae58cf
+SHA1 (patch-intl_lwbrk_nsJISx4051LineBreaker.cpp) = 3914a5c128b20ad7814a32104b28832bc36cb244
 SHA1 (patch-media_libyuv_source_mjpeg__decoder.cc) = 13656013a84a8c2be2df24d3e7c425b374587ec9
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ba581d0edc7cfa4a43e6f0dc8a75a914fef18ea9
 SHA1 (patch-modules_libpref_init_all.js) = 73dbe0c7001f9bfadb6ff7b50c340f7d135cb42a
diff --git a/firefox-hg/patches/patch-intl_lwbrk_nsJISx4051LineBreaker.cpp b/firefox-hg/patches/patch-intl_lwbrk_nsJISx4051LineBreaker.cpp
new file mode 100644
index 0000000000..b8f9077842
--- /dev/null
+++ b/firefox-hg/patches/patch-intl_lwbrk_nsJISx4051LineBreaker.cpp
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Conditionalize extended line breaks on the ICU version in use
+https://bugzilla.mozilla.org/show_bug.cgi?id=1317080
+
+
+--- intl/lwbrk/nsJISx4051LineBreaker.cpp.orig	2016-11-12 13:03:54.568706590 +0100
++++ intl/lwbrk/nsJISx4051LineBreaker.cpp	2016-11-12 20:13:06.907895087 +0100
+@@ -548,9 +548,11 @@
+     /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
+     /* HEBREW_LETTER = 38,                [HL] */ CLASS_CHARACTER,
+     /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
++#if U_ICU_VERSION_MAJOR_NUM > 57
+     /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
+     /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
+     /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER
++#endif
+   };
+ 
+ #if ENABLE_INTL_API