diff --git a/fontforge-arraysubscript.patch b/fontforge-arraysubscript.patch
new file mode 100644
index 0000000..32e13aa
--- /dev/null
+++ b/fontforge-arraysubscript.patch
@@ -0,0 +1,13 @@
+Index: fontforge-20120731-b/fontforge/contextchain.c
+===================================================================
+--- fontforge-20120731-b.orig/fontforge/contextchain.c
++++ fontforge-20120731-b/fontforge/contextchain.c
+@@ -928,7 +928,7 @@ return;
+ 	uc_strcpy(ubuf,buf);
+     } else {
+ 	ubuf[0]=' ';
+-	utf82u_strncpy(ubuf-1,classes[cols*r+0].u.md_str,sizeof(ubuf)/sizeof(ubuf[0])-2 );
++	utf82u_strncpy(ubuf+1,classes[cols*r+0].u.md_str,sizeof(ubuf)/sizeof(ubuf[0])-2 );
+ 	ubuf[sizeof(ubuf)/sizeof(ubuf[0])-2] = '\0';
+ 	uc_strcat(ubuf," ");
+     }
diff --git a/fontforge.changes b/fontforge.changes
index 4da8fd4..ea2fe92 100644
--- a/fontforge.changes
+++ b/fontforge.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Mar  9 13:40:08 UTC 2014 - schwab@linux-m68k.org
+
+- fontforge-arraysubscript.patch: Fix invalid array subscript
+
 -------------------------------------------------------------------
 Thu Nov 14 06:59:13 UTC 2013 - jengelh@inai.de
 
diff --git a/fontforge.spec b/fontforge.spec
index 24849c5..493f348 100644
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -34,6 +34,8 @@ Patch2:         libpng14-dynamic.diff
 # PATCH-FIX-OPENSUSE fontforge-python-module-name.diff -- change python module name according to naming policy
 Patch3:         fontforge-python-module-name.diff
 Patch4:         fontforge-fixgiflib.patch
+# PATCH-FIX-UPSTREAM http://sourceforge.net/p/fontforge/git/ci/9ae25e0
+Patch5:         fontforge-arraysubscript.patch
 
 BuildRequires:  cairo-devel
 BuildRequires:  fdupes
@@ -104,6 +106,7 @@ to develop applications that use FontForge libraries.
 %if 0%{?suse_version} > 1230
 %patch4 -p1
 %endif
+%patch5 -p1
 
 mkdir docs
 tar -jxvf %{SOURCE1} -C docs