diff --git a/gtk-doc-index.patch b/gtk-doc-index.patch
new file mode 100644
index 0000000..227815c
--- /dev/null
+++ b/gtk-doc-index.patch
@@ -0,0 +1,23 @@
+diff -up gtk-doc-1.11/gtkdoc-mkdb.in.index gtk-doc-1.11/gtkdoc-mkdb.in
+--- gtk-doc-1.11/gtkdoc-mkdb.in.index	2008-11-06 14:01:42.000000000 -0500
++++ gtk-doc-1.11/gtkdoc-mkdb.in	2008-11-23 17:37:33.000000000 -0500
+@@ -823,9 +823,9 @@ sub OutputIndex {
+             $short_symbol = $symbol;
+         }
+ 
+-        my $xref = &MakeXRef ($symbol);
+         my $curletter = uc(substr($short_symbol,0,1));
+         my $id = $apiindex{$symbol};
++        my $xref = &MakeXRef ($id, $symbol);
+         
+         #print "  add symbol $symbol with $id to index in section $curletter\n";
+ 
+@@ -2127,7 +2127,7 @@ sub CreateValidSGMLID {
+     # Special case, '_' would end up as '' so we use 'gettext-macro' instead.
+     if ($id eq "_") { return "gettext-macro"; }
+ 
+-    if ($id !~ /[a-z]/) { $id .= ":CAPS" };
++    if ($id !~ /[a-z]/ && $id !~ /-CAPS$/) { $id .= ":CAPS" };
+ 
+     $id =~ s/[_ ]/-/g;
+     $id =~ s/[,\.]//g;
diff --git a/gtk-doc.spec b/gtk-doc.spec
index cc2c00c..e5ebdcb 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -1,10 +1,12 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
 Version: 1.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and GFDL
 Group: Development/Tools
 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.11/gtk-doc-%{version}.tar.bz2 
+# http://bugzilla.gnome.org/show_bug.cgi?id=562064
+Patch0: gtk-doc-index.patch
 BuildArch: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gtk.org/gtk-doc
@@ -41,6 +43,7 @@ and GNOME.
 %prep
 
 %setup -q
+%patch0 -p1 -b .index
 
 # Move this doc file to avoid name collisions
 mv doc/README doc/README.docs
@@ -80,6 +83,9 @@ scrollkeeper-update -q
 %{_datadir}/omf/gtk-doc-manual
 
 %changelog
+* Sun Nov 23 2008 Matthias Clasen <mclasen@redhat.com> - 1.11-3
+- Fix an index generation problem
+
 * Fri Nov 21 2008 Matthias Clasen <mclasen@redhat.com> - 1.11-2
 - Update to 1.11