diff --git a/ChangeLog b/ChangeLog
index 9d9c3fd5a..18b20b6fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-10-17  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
+
+	* docs/Makefile.am (.texi): Canceled because the dependecies can
+	be circulated.
+	* stage2/builtins.c (embed_func): Set BUF_TRACK to -1 before
+	writing	the Stage 1.5 to the disk to clear the cache.
+	
 1999-10-17  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
 
 	* stage2/boot.c (load_initrd): Change types of *RAMDISK and
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 300c3ffa9..4615e1a4a 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -9,6 +9,10 @@ noinst_SCRIPTS = $(HELP2MAN) $(SRC2TEXI)
 EXTRA_DIST = menu.lst $(man_MANS) $(noinst_SCRIPTS) \
 	$(EXAMPLES) $(multiboot_TEXINFOS)
 
+# Cancel the rule %.texi -> %. This rule may confuse make to determine
+# the dependecies.
+.texi:
+
 %.c.texi: %.c $(srcdir)/$(SRC2TEXI)
 	/bin/sh $(srcdir)/$(SRC2TEXI) $(srcdir) $< $@
 
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 7ad8332ee..6cd5749d0 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -168,11 +168,6 @@ DVIPS = dvips
 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
-.texi:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
 .texinfo.info:
 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 	cd $(srcdir) \
@@ -407,6 +402,8 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+.texi:
+
 %.c.texi: %.c $(srcdir)/$(SRC2TEXI)
 	/bin/sh $(srcdir)/$(SRC2TEXI) $(srcdir) $< $@
 
diff --git a/stage2/builtins.c b/stage2/builtins.c
index dde6e7002..cace9e377 100644
--- a/stage2/builtins.c
+++ b/stage2/builtins.c
@@ -597,6 +597,9 @@ embed_func (char *arg, int flags)
 #endif
     }
 
+  /* Clear the cache.  */
+  buf_track = -1;
+  
   /* Now perform the embedding.  */
   for (i = 0; i < size; i++)
     {