diff --git a/ChangeLog b/ChangeLog
index 30037b459b..46533f6d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-11  Sven Neumann  <sven@gimp.org>
+
+	* app/config/Makefile.am: make test-config link properly.
+
 2008-06-11  Sven Neumann  <sven@gimp.org>
 
 	* configure.in: use IT_PO_SUBDIR() to define the extra po
diff --git a/app/config/Makefile.am b/app/config/Makefile.am
index 5d6270087f..be709aa3dd 100644
--- a/app/config/Makefile.am
+++ b/app/config/Makefile.am
@@ -65,10 +65,11 @@ TESTS = test-config
 test_config_DEPENDENCIES = $(gimpconfig_libs)
 
 test_config_LDFLAGS = \
-	-u $(SYMPREFIX)xcf_init			\
-	-u $(SYMPREFIX)internal_procs_init	\
-	-u $(SYMPREFIX)gimp_coords_mix		\
-	-u $(SYMPREFIX)gimp_plug_in_manager_restore
+	-u $(SYMPREFIX)xcf_init				\
+	-u $(SYMPREFIX)internal_procs_init		\
+	-u $(SYMPREFIX)gimp_coords_mix			\
+	-u $(SYMPREFIX)gimp_plug_in_manager_restore	\
+	-u $(SYMPREFIX)gimp_image_map_config_get_type
 
 test_config_LDADD = \
 	../widgets/widgets-enums.o		\
@@ -83,8 +84,8 @@ test_config_LDADD = \
 	../vectors/libappvectors.a		\
 	../paint/libapppaint.a			\
 	../text/libapptext.a			\
-	libappconfig.a				\
 	../gegl/libappgegl.a			\
+	libappconfig.a				\
 	../paint-funcs/libapppaint-funcs.a	\
 	../composite/libappcomposite.a		\
 	../base/libappbase.a			\
@@ -95,6 +96,7 @@ test_config_LDADD = \
 	$(libgimpmath)				\
 	$(libgimpconfig)			\
 	$(libgimpbase)				\
+	$(CAIRO_LIBS)				\
 	$(PANGOFT2_LIBS)			\
 	$(GDK_PIXBUF_LIBS)			\
 	$(LIBART_LIBS)				\