diff --git a/ChangeLog b/ChangeLog
index 5d0328e67..23df32a75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-19  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* docs/mdate-sh: Moved to ...
+	* mdate-sh: ... here.
+	* docs/texinfo.tex: Moved to ...
+	* texinfo.tex: ... here.
+	
 2000-06-09  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* stage2/mb_info.h (AddrRangeDesc): Use one 64bits field instead
diff --git a/Makefile.in b/Makefile.in
index c9d9a6db9..1092648ad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,7 +100,8 @@ DIST_SOURCES =
 DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
 Makefile.am Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 \
 aclocal.m4 compile config.guess config.h.in config.sub configure \
-configure.in depcomp install-sh missing mkinstalldirs
+configure.in depcomp install-sh mdate-sh missing mkinstalldirs \
+texinfo.tex
 
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/docs/Makefile.in b/docs/Makefile.in
index b15816905..11c6aa62b 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -118,7 +118,7 @@ MANS = $(man_MANS)
 
 NROFF = nroff
 DIST_COMMON =  $(grub_TEXINFOS) $(multiboot_TEXINFOS) Makefile.am \
-Makefile.in mdate-sh stamp-vti texinfo.tex version.texi
+Makefile.in stamp-vti version.texi
 
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -139,7 +139,7 @@ $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@stamp-vti
 	@:
 
 $(srcdir)/stamp-vti: grub.texi $(top_srcdir)/configure.in
-	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/grub.texi`" > vti.tmp
+	@echo "@set UPDATED `$(SHELL) $(top_srcdir)/mdate-sh $(srcdir)/grub.texi`" > vti.tmp
 	@echo "@set EDITION $(VERSION)" >> vti.tmp
 	@echo "@set VERSION $(VERSION)" >> vti.tmp
 	@cmp -s vti.tmp $(srcdir)/version.texi \
@@ -174,7 +174,7 @@ DVIPS = dvips
 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texi.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+	TEXINPUTS=$(top_srcdir):$$TEXINPUTS \
 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 .texinfo.info:
@@ -188,7 +188,7 @@ DVIPS = dvips
 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texinfo.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+	TEXINPUTS=$(top_srcdir):$$TEXINPUTS \
 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 .txi.info:
@@ -197,7 +197,7 @@ DVIPS = dvips
 	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .txi.dvi:
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+	TEXINPUTS=$(top_srcdir):$$TEXINPUTS \
 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 .txi:
diff --git a/docs/mdate-sh b/mdate-sh
similarity index 100%
rename from docs/mdate-sh
rename to mdate-sh
diff --git a/docs/texinfo.tex b/texinfo.tex
similarity index 100%
rename from docs/texinfo.tex
rename to texinfo.tex