diff --git a/fix-fixxref.patch b/fix-fixxref.patch
new file mode 100644
index 0000000..89b062d
--- /dev/null
+++ b/fix-fixxref.patch
@@ -0,0 +1,69 @@
+diff -up gtk-doc-1.13/gtkdoc-fixxref.in.fix-fixxref gtk-doc-1.13/gtkdoc-fixxref.in
+--- gtk-doc-1.13/gtkdoc-fixxref.in.fix-fixxref	2009-12-17 14:36:51.000000000 -0500
++++ gtk-doc-1.13/gtkdoc-fixxref.in	2010-01-06 17:56:55.457121567 -0500
+@@ -168,36 +168,38 @@ foreach my $dir (@EXTRA_DIRS) {
+     }
+ }
+ 
+-open (INPUT, "$MODULE-sections.txt")
+-	|| die "Can't open $MODULE-sections.txt: $!";
+-my $subsection = "";
+-while (<INPUT>) {
+-    if (m/^#/) {
+-        next;
+-
+-    } elsif (m/^<SECTION>/) {
+-        $subsection = "";
+-    } elsif (m/^<SUBSECTION\s*(.*)>/i) {
+-        $subsection = $1;
+-    } elsif (m/^<SUBSECTION>/) {
+-        next;
+-    } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
+-        next;
+-    } elsif (m/^<FILE>(.*)<\/FILE>/) {
+-        next;
+-    } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
+-        next;
+-    } elsif (m/^<\/SECTION>/) {
+-        next;
+-    } elsif (m/^(\S+)/) {
+-        my $symbol=CreateValidSGMLID($1);
+-
+-        if ($subsection eq "Standard" || $subsection eq "Private") {
+-            $NoLinks{$symbol} = 1;
++if (defined($MODULE)) {
++    open (INPUT, "$MODULE-sections.txt")
++            || die "Can't open $MODULE-sections.txt: $!";
++    my $subsection = "";
++    while (<INPUT>) {
++        if (m/^#/) {
++            next;
++
++        } elsif (m/^<SECTION>/) {
++            $subsection = "";
++        } elsif (m/^<SUBSECTION\s*(.*)>/i) {
++            $subsection = $1;
++        } elsif (m/^<SUBSECTION>/) {
++            next;
++        } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
++            next;
++        } elsif (m/^<FILE>(.*)<\/FILE>/) {
++            next;
++        } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
++            next;
++        } elsif (m/^<\/SECTION>/) {
++            next;
++        } elsif (m/^(\S+)/) {
++            my $symbol=CreateValidSGMLID($1);
++
++            if ($subsection eq "Standard" || $subsection eq "Private") {
++                $NoLinks{$symbol} = 1;
++            }
+         }
+     }
++    close (INPUT);
+ }
+-close (INPUT);
+ 
+ &FixCrossReferences ($MODULE_DIR);
+ 
diff --git a/gtk-doc.spec b/gtk-doc.spec
index b80daaf..9240e6d 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -1,7 +1,7 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
 Version: 1.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: Development/Tools
 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.13/gtk-doc-%{version}.tar.bz2
@@ -28,6 +28,9 @@ Requires: sgml-common
 Source1: filter-requires-gtk-doc.sh
 %define __perl_requires %{SOURCE1}
 
+# upstream fix
+Patch0: fix-fixxref.patch
+
 %description
 gtk-doc is a tool for generating API reference documentation.
 It is used for generating the documentation for GTK+, GLib
@@ -36,6 +39,7 @@ and GNOME.
 %prep
 
 %setup -q
+%patch0 -R -p1 -b .fix-fixxref
 
 # Move this doc file to avoid name collisions
 mv doc/README doc/README.docs
@@ -69,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/omf/gtk-doc-manual
 
 %changelog
+* Wed Jan  6 2010 Matthias Clasen <mclasen@redhat.com> - 1.13-2
+- Fix issues with gtkdoc-fixxref
+
 * Tue Dec 22 2009 Matthias Clasen <mclasen@redhat.com> - 1.13-1
 - Update to 1.13