diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 78c2812bb..998f54a80 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -43,7 +43,7 @@ modinclude_DATA = scmconfig.h
 bin_SCRIPTS = guile-snarf
 
 EXTRA_DIST = gscm.c gscm.h ChangeLog-scm dynl-dl.c dynl-dld.c dynl-shl.c \
-dynl-vms.c PLUGIN/REQ PLUGIN/guile.config PLUGIN/guile.libs
+dynl-vms.c PLUGIN/REQ PLUGIN/guile.config PLUGIN/guile.libs.in
 
 ## FIXME: shouldn't directly generate file; instead generate temp file
 ## and "mv".  Consider using timestamp file as well, to avoid
@@ -58,5 +58,10 @@ SUFFIXES = .x
 .c.x:
 	./guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
 
+## When dynamic linking is disabled, this dependency is not
+## automatically detected.
+
+dynl.o: dynl.x
+
 ## Add -MG to make the .x magic work with auto-dep code.
 MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
diff --git a/libguile/Makefile.in b/libguile/Makefile.in
index 77e6f14d3..9677d43aa 100644
--- a/libguile/Makefile.in
+++ b/libguile/Makefile.in
@@ -40,6 +40,7 @@ transform = @program_transform_name@
 FD_SETTER = @FD_SETTER@
 RANLIB = @RANLIB@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+xtra_PLUGIN_guile_libs = @xtra_PLUGIN_guile_libs@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 module = @module@
@@ -83,7 +84,7 @@ modinclude_DATA = scmconfig.h
 bin_SCRIPTS = guile-snarf
 
 EXTRA_DIST = gscm.c gscm.h ChangeLog-scm dynl-dl.c dynl-dld.c dynl-shl.c \
-dynl-vms.c PLUGIN/REQ PLUGIN/guile.config PLUGIN/guile.libs
+dynl-vms.c PLUGIN/REQ PLUGIN/guile.config PLUGIN/guile.libs.in
 
 SUFFIXES = .x
 
@@ -475,6 +476,8 @@ libpath.h: Makefile
 .c.x:
 	./guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
 
+dynl.o: dynl.x
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: