diff --git a/.cvsignore b/.cvsignore
index 2b84064..36ec8cd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-fontforge_full-20061019.tar.bz2
 fontforge_htdocs-20061014.tar.bz2
+fontforge_full-20061025.tar.bz2
diff --git a/fontforge-20061025-usFirstCharIndex.patch b/fontforge-20061025-usFirstCharIndex.patch
new file mode 100644
index 0000000..5daf328
--- /dev/null
+++ b/fontforge-20061025-usFirstCharIndex.patch
@@ -0,0 +1,10 @@
+--- fontforge-20061025/fontforge/tottf.c.usFirstCharIndex	2006-10-05 07:29:12.000000000 +0330
++++ fontforge-20061025/fontforge/tottf.c	2006-11-25 13:59:52.000000000 +0330
+@@ -3187,7 +3187,6 @@
+ 	os2->firstcharindex = 0xf000 + first;	/* This gets mapped to space */
+ 	os2->lastcharindex  = 0xf000 + last;
+     } else {
+-	if ( first>13 && format!=ff_otf && format!=ff_otfcid ) first = 13;	/* We give the font an extra char mapped to cr (13) */
+ 	os2->firstcharindex = first;
+ 	os2->lastcharindex = last;
+ 	OS2FigureCodePages(sf, os2->ulCodePage);
diff --git a/fontforge.spec b/fontforge.spec
index 0284c6f..8f36540 100644
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -2,7 +2,7 @@
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20061019
+Version:        20061025
 Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
@@ -12,6 +12,7 @@ URL:            http://fontforge.sourceforge.net/
 Source0:        http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        fontforge.desktop
 Source2:        http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
+Patch1:         fontforge-20061025-usFirstCharIndex.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       htmlview
@@ -39,6 +40,7 @@ fonts. It supports a range of font formats, including PostScript
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .usFirstCharIndex
 
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
@@ -112,6 +114,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 25 2006 Roozbeh Pournader <roozbeh@farsiweb.info> - 20061025-1
+- Update to 20061025
+- Patch to correct usFirstCharIndex (George Williams)
+
 * Fri Oct 20 2006 Kevin Fenzi <kevin@tummy.com> - 20061019-1
 - Update to 20061019