diff --git a/srfi/Makefile.am b/srfi/Makefile.am
index 01e16aa99..00ec079bd 100644
--- a/srfi/Makefile.am
+++ b/srfi/Makefile.am
@@ -22,7 +22,7 @@
 AUTOMAKE_OPTIONS = gnu
 
 ## Prevent automake from adding extra -I options
-DEFS = @DEFS@
+DEFS = @DEFS@ @EXTRA_DEFS@
 ## Check for headers in $(srcdir)/.., so that #include
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
 ## building.
@@ -34,10 +34,12 @@ lib_LTLIBRARIES = libguile-srfi-srfi-13-14.la libguile-srfi-srfi-4.la
 BUILT_SOURCES = srfi-13.x srfi-14.x srfi-4.x
 libguile_srfi_srfi_13_14_la_SOURCES = srfi-13.x srfi-13.c srfi-14.x srfi-14.c\
  srfi-13.h srfi-14.h
-libguile_srfi_srfi_13_14_la_LDFLAGS = -version-info 0:0 -export-dynamic
+libguile_srfi_srfi_13_14_la_LDFLAGS = -version-info 0:0 -export-dynamic -no-undefined
+libguile_srfi_srfi_13_14_la_LIBADD = $(top_srcdir)/libguile/libguile.la
 
 libguile_srfi_srfi_4_la_SOURCES = srfi-4.x srfi-4.c srfi-4.h
-libguile_srfi_srfi_4_la_LDFLAGS = -version-info 0:0 -export-dynamic
+libguile_srfi_srfi_4_la_LDFLAGS = -version-info 0:0 -export-dynamic -no-undefined
+libguile_srfi_srfi_4_la_LIBADD = $(top_srcdir)/libguile/libguile.la
 
 srfidir = $(datadir)/guile/$(VERSION)/srfi
 srfi_DATA = srfi-1.scm \