diff --git a/ChangeLog b/ChangeLog
index f8f1d86b7..9d3d7de3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-07-05  Miguel de Icaza  <miguel@gnu.org>
+
+	* Makefile.in (all): Makefile fix.
+
+1999-05-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* Make.common.in (confdir): Define confdir as sysconfdir.  This
+	should fix the problem we had with FSSTND distributions.
+
 1999-07-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* Makefile.in (DISTMAIN): Added config.guess and config.sub to the
diff --git a/Makefile.in b/Makefile.in
index 696cfc1d6..4d8d55553 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,9 +24,7 @@ DISTMAIN =	configure configure.in NEWS README INSTALL INSTALL.FAST \
 
 all: 
 	@for dir in @INTLSUB@ ${codedirs} @POSUB@; do \
-		cd $$dir; \
-		${MAKE} all || exit 1; \
-		cd .. ;\
+		(cd $$dir; ${MAKE} all || exit 1) \
 	done
 
 static:
diff --git a/lib/mc.hint b/lib/mc.hint
index 35d0f05b3..831e4efbe 100644
--- a/lib/mc.hint
+++ b/lib/mc.hint
@@ -8,9 +8,9 @@ Hint: Tired of these messages?  Turn them off from the Options/Layout menu.
 Hint: Selecting directories: add a slash to the end of the matching pattern.
 Hint: If your terminal lacks functions keys, use the ESC+number sequence.
 Hint: There is a Midnight Commander URL: http://www.gnome.org/mc/
-Hint: The latest version of the Commander is in: ftp://prep.ai.mit.edu/pub/gnu/
+Hint: The latest version of the Commander is in: ftp://ftp.gnome.org/pub/GNOME/sources/mc
 Hint: Please send any bug reports to mc-bugs@nuclecu.unam.mx
-Hint: Midnight Commander home site: ftp://ftp.nuclecu.unam.mx/linux/local/
+Hint: Midnight Commander home site: http://www.gnome.org/mc
 Hint: Tab changes your current panel.
 Hint: VFS coolness: tap enter on a tar file to examine its contents.
 Hint: We also have a nice manual page.
diff --git a/src/ChangeLog b/src/ChangeLog
index e6dd98a32..69ba72759 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-01  Robert Brady  <rwb197@ecs.soton.ac.uk>
+
+	* file.c (move_dir_dir): Give an error when an attempt is made to
+	move an empty directory into itself.
+
 1999-06-24  smil@linuxfan.com
 
 	* view.c (view_update_bytes_per_line, display): show correctly the