diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am
index dc7dc373..2464a279 100644
--- a/src/test_libFLAC++/Makefile.am
+++ b/src/test_libFLAC++/Makefile.am
@@ -25,7 +25,7 @@ EXTRA_DIST = \
 
 noinst_PROGRAMS = test_libFLAC++
 test_libFLAC___LDADD = \
-	$(top_builddir)/src/share/grabbag/grabbag.la \
+	$(top_builddir)/src/share/grabbag/libgrabbag.a \
 	$(top_builddir)/src/libFLAC++/libFLAC++.la \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
 	-lm
diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am
index 2e13638c..11494247 100644
--- a/src/test_libFLAC/Makefile.am
+++ b/src/test_libFLAC/Makefile.am
@@ -25,7 +25,7 @@ INCLUDES = -I$(top_srcdir)/src/libFLAC/include
 
 noinst_PROGRAMS = test_libFLAC
 test_libFLAC_LDADD = \
-	$(top_builddir)/src/share/grabbag/grabbag.la \
+	$(top_builddir)/src/share/grabbag/libgrabbag.a \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
 	-lm
 test_libFLAC_SOURCES = \
diff --git a/src/test_libOggFLAC++/Makefile.am b/src/test_libOggFLAC++/Makefile.am
index 367813a8..b6964be7 100644
--- a/src/test_libOggFLAC++/Makefile.am
+++ b/src/test_libOggFLAC++/Makefile.am
@@ -25,7 +25,7 @@ CFLAGS = @CFLAGS@ @OGG_CFLAGS@
 
 noinst_PROGRAMS = test_libOggFLAC++
 test_libOggFLAC___LDADD = \
-	$(top_builddir)/src/share/grabbag/grabbag.la \
+	$(top_builddir)/src/share/grabbag/libgrabbag.a \
 	$(top_builddir)/src/libOggFLAC++/libOggFLAC++.la \
 	$(top_builddir)/src/libOggFLAC/libOggFLAC.la \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
diff --git a/src/test_libOggFLAC/Makefile.am b/src/test_libOggFLAC/Makefile.am
index 080a288c..64bf1840 100644
--- a/src/test_libOggFLAC/Makefile.am
+++ b/src/test_libOggFLAC/Makefile.am
@@ -25,7 +25,7 @@ INCLUDES =
 
 noinst_PROGRAMS = test_libOggFLAC
 test_libOggFLAC_LDADD = \
-	$(top_builddir)/src/share/grabbag/grabbag.la \
+	$(top_builddir)/src/share/grabbag/libgrabbag.a \
 	$(top_builddir)/src/libOggFLAC/libOggFLAC.la \
 	$(top_builddir)/src/libFLAC/libFLAC.la \
 	@OGG_LIBS@ \