diff --git a/Makefile.am b/Makefile.am
index 2374fc28..303af1d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,24 +131,24 @@ EXTRA_SRC = event_tagging.c http.c evdns.c evrpc.c
 
 libevent_la_SOURCES = $(CORE_SRC) $(EXTRA_SRC)
 libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
-libevent_la_LDFLAGS = -version-info $(VERSION_INFO)
+libevent_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
 
 libevent_core_la_SOURCES = $(CORE_SRC)
 libevent_core_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
-libevent_core_la_LDFLAGS = -version-info $(VERSION_INFO)
+libevent_core_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
 
 if PTHREADS
 libevent_pthreads_la_SOURCES = evthread_pthread.c
 endif
 
 libevent_extra_la_SOURCES = $(EXTRA_SRC)
-libevent_extra_la_LIBADD =
-libevent_extra_la_LDFLAGS = -version-info $(VERSION_INFO)
+libevent_extra_la_LIBADD = libevent_core.la $(SYS_LIBS)
+libevent_extra_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
 
 if OPENSSL
 libevent_openssl_la_SOURCES = bufferevent_openssl.c
-libevent_openssl_la_LIBADD = -lcrypto -lssl
-libevent_openssl_la_LDFLAGS = -version-info $(VERSION_INFO)
+libevent_openssl_la_LIBADD = libevent_core.la -lcrypto -lssl
+libevent_openssl_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
 endif
 
 noinst_HEADERS = util-internal.h mm-internal.h ipv6-internal.h \