diff --git a/Makefile.am b/Makefile.am
index ce0d6f08..3a750f44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS        = -U_FORTIFY_SOURCE
 AM_CPPFLAGS       += -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE
 AM_CPPFLAGS       += -DFINIT_CONF=\"$(conf)\" -DFINIT_RCSD=\"$(rcsd)\" -DFINIT_FIFO=\"$(fifo)\" \
 		     -DPLUGIN_PATH=\"$(pkglibdir)\"
+AM_LDFLAGS         = -export-dynamic
 
 # Slightly ugly hacks to prevent the build system from installing
 # libuev/libite, which it does if we use the more plain SUBDIRS.
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index bb356588..f953b550 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,4 +1,4 @@
-AM_LDFLAGS          = -module -avoid-version -shared -no-undefined -export-dynamic
+AM_LDFLAGS          = -module -avoid-version -shared
 AM_CPPFLAGS         = -U_FORTIFY_SOURCE
 AM_CPPFLAGS        += -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE
 AM_CPPFLAGS        += -DFINIT_FIFO=\"$(fifo)\"