diff --git a/src/sieve-tools/Makefile.am b/src/sieve-tools/Makefile.am
index 7cbc30106c6aefd5d006b8ab2417b45e6c8022c8..705bbba00a95e9be4d357c42628f0c14eac2bbea 100644
--- a/src/sieve-tools/Makefile.am
+++ b/src/sieve-tools/Makefile.am
@@ -12,10 +12,10 @@ AM_CPPFLAGS = \
 	-I$(dovecot_incdir)/src/lib-storage \
 	-I$(dovecot_incdir)/src/deliver
 
-#sievec_LDFLAGS = -export-dynamic -Wl,--start-group 
-#sieved_LDFLAGS = -export-dynamic -Wl,--start-group 
-#sieve_test_LDFLAGS = -export-dynamic -Wl,--start-group
-#sieve_filter_LDFLAGS = -export-dynamic -Wl,--start-group
+sievec_LDFLAGS = -export-dynamic 
+sieved_LDFLAGS = -export-dynamic 
+sieve_test_LDFLAGS = -export-dynamic
+sieve_filter_LDFLAGS = -export-dynamic
 
 libs = \
 	$(top_srcdir)/src/lib-sieve/libsieve.la \
diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am
index fff2bc7899ecf48591a3e105beb998a5a97d9c20..66050b5ab933435b06e9169442703a36eb0ccc60 100644
--- a/src/testsuite/Makefile.am
+++ b/src/testsuite/Makefile.am
@@ -9,20 +9,14 @@ AM_CPPFLAGS = \
 	-I$(dovecot_incdir)/src/lib-index \
 	-I$(dovecot_incdir)/src/lib-storage
 
-testsuite_LDFLAGS = -export-dynamic -Wl,--start-group 
+testsuite_LDFLAGS = -export-dynamic
 
 libs = \
 	$(top_srcdir)/src/lib-sieve/libsieve.la \
 	$(top_srcdir)/src/lib-sieve-tool/libsieve-tool.la \
 	$(dovecot_incdir)/src/lib-storage/list/libstorage_list.a \
 	$(dovecot_incdir)/src/lib-storage/register/libstorage-register.a \
-	$(STORAGE_LIBS) \
-	$(dovecot_incdir)/src/lib-storage/libstorage.a \
-	$(dovecot_incdir)/src/lib-index/libindex.a \
-	$(dovecot_incdir)/src/lib-imap/libimap.a \
-	$(dovecot_incdir)/src/lib-mail/libmail.a \
-	$(dovecot_incdir)/src/lib-charset/libcharset.a \
-	$(dovecot_incdir)/src/lib/liblib.a
+	$(STORAGE_LIBS)
 
 ldadd = \
 	$(libs) \