diff --git a/.gitignore b/.gitignore
index c6898c9..362a58e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/harfbuzz-0.9.20.tar.bz2
+SOURCES/harfbuzz-0.9.36.tar.bz2
diff --git a/.harfbuzz.metadata b/.harfbuzz.metadata
index 9fafc69..3c9b09b 100644
--- a/.harfbuzz.metadata
+++ b/.harfbuzz.metadata
@@ -1 +1 @@
-82c3c0d461f239d0991e660a5895a11d1c75e535 SOURCES/harfbuzz-0.9.20.tar.bz2
+237e869d9dafc30c37cb6ab9886a616ffee6d71e SOURCES/harfbuzz-0.9.36.tar.bz2
diff --git a/SOURCES/harfbuzz-0.9.20-fix-graphite2.patch b/SOURCES/harfbuzz-0.9.20-fix-graphite2.patch
deleted file mode 100644
index 5f910e6..0000000
--- a/SOURCES/harfbuzz-0.9.20-fix-graphite2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/hb-graphite2.cc b/src/hb-graphite2.cc
-index a309ca8..709aa94 100644
---- a/src/hb-graphite2.cc
-+++ b/src/hb-graphite2.cc
-@@ -209,6 +209,7 @@ struct hb_graphite2_cluster_t {
-   unsigned int num_chars;
-   unsigned int base_glyph;
-   unsigned int num_glyphs;
-+  unsigned int cluster;
- };
- 
- hb_bool_t
-@@ -299,6 +300,7 @@ _hb_graphite2_shape (hb_shape_plan_t    *shape_plan,
-   memset (clusters, 0, sizeof (clusters[0]) * buffer->len);
- 
-   hb_codepoint_t *pg = gids;
-+  clusters[0].cluster = buffer->info[0].cluster;
-   for (is = gr_seg_first_slot (seg), ic = 0; is; is = gr_slot_next_in_segment (is), ic++)
-   {
-     unsigned int before = gr_slot_before (is);
-@@ -316,6 +318,7 @@ _hb_graphite2_shape (hb_shape_plan_t    *shape_plan,
-     {
-       hb_graphite2_cluster_t *c = clusters + ci + 1;
-       c->base_char = clusters[ci].base_char + clusters[ci].num_chars;
-+      c->cluster = buffer->info[c->base_char].cluster;
-       c->num_chars = before - c->base_char;
-       c->base_glyph = ic;
-       c->num_glyphs = 0;
-@@ -335,7 +338,7 @@ _hb_graphite2_shape (hb_shape_plan_t    *shape_plan,
-     {
-       hb_glyph_info_t *info = &buffer->info[clusters[i].base_glyph + j];
-       info->codepoint = gids[clusters[i].base_glyph + j];
--      info->cluster = gr_cinfo_base(gr_seg_cinfo(seg, clusters[i].base_char));
-+      info->cluster = clusters[i].cluster;
-     }
-   }
-   buffer->len = glyph_count;
diff --git a/SPECS/harfbuzz.spec b/SPECS/harfbuzz.spec
index 1e2b61d..79b20db 100644
--- a/SPECS/harfbuzz.spec
+++ b/SPECS/harfbuzz.spec
@@ -1,12 +1,12 @@
 Name:           harfbuzz
-Version:        0.9.20
-Release:        4%{?dist}
+Version:        0.9.36
+Release:        1%{?dist}
 Summary:        Text shaping library
 
 License:        MIT
 URL:            http://freedesktop.org/wiki/Software/HarfBuzz
 Source0:        http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
-Patch0:         harfbuzz-0.9.20-fix-graphite2.patch
+
 BuildRequires:  cairo-devel
 BuildRequires:  freetype-devel
 BuildRequires:  glib2-devel
@@ -36,7 +36,7 @@ This package contains Harfbuzz ICU support library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-graphite2
+
 
 %build
 %configure --disable-static --with-graphite2
@@ -79,6 +79,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/libharfbuzz-icu.so.*
 
 %changelog
+* Tue Apr 28 2015 Parag Nemade <pnemade AT redhat DOT com> - 0.9.36-1
+- Update to 0.9.36 upstream release
+- Resolves: #1201148
+
 * Mon Aug 18 2014 Parag Nemade <pnemade AT redhat DOT com> - 0.9.20-4
 - Resolves:rh#998812 - gedit segfaults when loading a certain file