diff --git a/ChangeLog b/ChangeLog
index 42c68d7a39..f79b8125ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-26  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* docs/libs/Makefile.am:
+	Include our build-prefix libs and includes before the generic ones to
+	avoid linking against the installed libs when we want the build-tree
+	ones.
+
 2007-07-26  Tim-Philipp Müller  <tim at centricular dot net>
 
 	Patch by: Steve Fink  <sphink gmail com>
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 96d90f759d..d8230f210d 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -81,8 +81,8 @@ extra_files =
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
 # contains GtkObjects/GObjects and you want to document signals and properties.
-GTKDOC_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_builddir) -I$(top_builddir)/libs
-GTKDOC_LIBS = $(GST_OBJ_LIBS) $(SCANOBJ_DEPS)
+GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_builddir)/libs $(GST_OBJ_CFLAGS)
+GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_OBJ_LIBS)
 
 GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
 GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)