diff --git a/Makefile b/Makefile
index 47c0e5a8..3b42a1bd 100644
--- a/Makefile
+++ b/Makefile
@@ -135,12 +135,9 @@ chibi-scheme.pc: chibi-scheme.pc.in
 
 # A special case, this needs to be linked with the LDFLAGS in case
 # we're using Boehm.
-lib/chibi/ast$(SO): lib/chibi/ast.c $(INCLUDES)
+lib/chibi/ast$(SO): lib/chibi/ast.c $(INCLUDES) libchibi-scheme$(SO)
 	-$(CC) $(CLIBFLAGS) $(CLINKFLAGS) $(XCPPFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ $< $(GCLDFLAGS) -L. -lchibi-scheme
 
-doc/lib/chibi/%.html: lib/chibi/%.sld $(CHIBI_DOC_DEPENDENCIES)
-	$(CHIBI_DOC) --html chibi.$* > $@
-
 doc: doc/chibi.html doc-libs
 
 %.html: %.scrbl $(CHIBI_DOC_DEPENDENCIES)
diff --git a/Makefile.libs b/Makefile.libs
index 4c2ef0ed..00eaab29 100644
--- a/Makefile.libs
+++ b/Makefile.libs
@@ -48,12 +48,12 @@ all-libs: $(COMPILED_LIBS)
 lib/%.c: lib/%.stub $(CHIBI_FFI_DEPENDENCIES)
 	$(CHIBI_FFI) $<
 
-lib/%$(SO): lib/%.c $(INCLUDES)
+lib/%$(SO): lib/%.c $(INCLUDES) libchibi-scheme$(SO)
 	$(CC) $(CLIBFLAGS) $(CLINKFLAGS) $(XCPPFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ $< -L. $(XLIBS) -lchibi-scheme
 
 doc-libs: $(HTML_LIBS)
 
-doc/lib/%.html: lib/%.sld
+doc/lib/%.html: lib/%.sld $(CHIBI_DOC_DEPENDENCIES)
 	$(MKDIR) $(dir $@)
 	$(CHIBI_DOC) --html $(subst /,.,$*) > $@