diff --git a/gnome-doc-utils-fig-path.patch b/gnome-doc-utils-fig-path.patch
new file mode 100644
index 0000000..e4cdda8
--- /dev/null
+++ b/gnome-doc-utils-fig-path.patch
@@ -0,0 +1,15 @@
+diff --git a/tools/gnome-doc-utils.make b/tools/gnome-doc-utils.make
+index 726c5b8..339817f 100644
+--- a/tools/gnome-doc-utils.make
++++ b/tools/gnome-doc-utils.make
+@@ -640,8 +640,8 @@ install-doc-figs:
+ 	    fi; \
+ 	    figbase=`echo $$fig | sed -e 's/^.*\///'`; \
+ 	    if $$figsymlink; then \
+-	      echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \
+-	      ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \
++	      echo "cd $$figdir && $(LN_S) -f $(HELP_DIR)/$(_doc_install_dir)/C/$$fig $$figbase"; \
++	      ( cd "$$figdir" && $(LN_S) -f "$(HELP_DIR)/$(_doc_install_dir)/C/$$fig" "$$figbase" ); \
+ 	    else \
+ 	      echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \
+ 	      $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \
diff --git a/gnome-doc-utils.changes b/gnome-doc-utils.changes
index ed556a4..cf521b2 100644
--- a/gnome-doc-utils.changes
+++ b/gnome-doc-utils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug 29 21:25:38 UTC 2012 - dimstar@opensuse.org
+
+- Add gnome-doc-utils-fig-path.patch: Fix linking of figures in
+  subfolders, where a relative path to ../../C will not do the
+  right thing (gnome-devel-docs 3.5.90 contains such cases).
+
 -------------------------------------------------------------------
 Mon Mar 26 19:02:29 UTC 2012 - vuntz@opensuse.org
 
diff --git a/gnome-doc-utils.spec b/gnome-doc-utils.spec
index 0cb76a4..fca8e86 100644
--- a/gnome-doc-utils.spec
+++ b/gnome-doc-utils.spec
@@ -24,6 +24,8 @@ License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://www.gnome.org
 Source:         http://download.gnome.org/sources/gnome-doc-utils/0.20/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-doc-utils-fig-path.patch bgo#682776 dimstar@opensuse.org -- Fix linking of figs in subfolders.
+Patch0:         gnome-doc-utils-fig-path.patch
 BuildRequires:  docbook_4
 BuildRequires:  fdupes
 BuildRequires:  intltool
@@ -89,6 +91,7 @@ POT files.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 translation-update-upstream
 
 %build