diff --git a/icu.icu6084.zwnj.notdef.patch b/icu.icu6084.zwnj.notdef.patch
new file mode 100644
index 0000000..0df2fa5
--- /dev/null
+++ b/icu.icu6084.zwnj.notdef.patch
@@ -0,0 +1,13 @@
+--- icu.orig/source/layout/OpenTypeLayoutEngine.cpp	2007-12-11 11:18:20.000000000 +0000
++++ icu/source/layout/OpenTypeLayoutEngine.cpp	2007-12-11 11:19:22.000000000 +0000
+@@ -338,7 +338,9 @@
+     for (le_int32 g = 0; g < glyphCount; g += 1) {
+         LEGlyphID glyph = glyphStorage[g];
+ 
+-        if (glyph == zwnj) {
++        if (!glyph) {
++            continue;
++        } else if (glyph == zwnj) {
+             glyphStorage[g] = LE_SET_GLYPH(glyph, 0xFFFF);
+         } else if (glyph == nbsp) {
+             glyphStorage[g] = LE_SET_GLYPH(glyph, 0x0003);
diff --git a/icu.spec b/icu.spec
index 1bc7d44..8c80380 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   3.8
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT
@@ -20,6 +20,7 @@ Patch8:  icu.icu5506.multiplevowels.patch
 Patch9:  icu.icuXXXX.malayalam.bysyllable.patch
 Patch10: icu.icu6008.arm.padding.patch
 Patch11: icu.openoffice.org.patch
+Patch12: icu.icu6084.zwnj.notdef.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -67,7 +68,8 @@ Group:   Documentation
 %patch8  -p1 -b .icu5506.multiplevowels.patch
 %patch9  -p1 -b .icuXXXX.malayalam.bysyllable.patch
 %patch10 -p1 -b .icu6008.arm.padding.patch
-%patch11 -p1 -b .icu.openoffice.org.patch
+%patch11 -p1 -b .openoffice.org.patch
+%patch12 -p1 -b .icu6084.zwnj.notdef.patch
 
 %build
 cd source
@@ -144,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Tue Dec 11 2007 Caolan McNamara <caolanm@redhat.com> - 3.8-5
+- Resolves: rhbz#415541 icu.icu6084.zwnj.notdef.patch
+
 * Wed Nov 28 2007 Caolan McNamara <caolanm@redhat.com> - 3.8-4
 - Resolves: ooo#83991 Malayalam "Kartika" font fix