diff --git a/ChangeLog b/ChangeLog
index ec4431e19..45735c4e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-09-14  Pavel Roskin  <proski@gnu.org>
 
+	* configure.in: remove any manupulations with top_srcdir.
+	Don't change CPPGLAGS when the internal editor is enabled,
+	instead do it ...
+	* edit/Makefile.in, gtkedit/Makefile.in: ... here
+
 	* configure.in, Make.common.in, doc/Makefile.in,
 	edit/Makefile.in, gnome/Makefile.in, gtkedit/Makefile.in,
 	slang/Makefile.in, src/Makefile.in, vfs/Make-mc.in: rootdir
diff --git a/configure.in b/configure.in
index d85ec06fc..78f1964b1 100644
--- a/configure.in
+++ b/configure.in
@@ -7,9 +7,6 @@ AM_INIT_AUTOMAKE(mc, 4.5.51)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
-top_srcdir=`dirname $0`
-AC_SUBST(top_srcdir)
-
 dnl This is path where we're looking for headers in addition to /usr/include
 dnl and whatever cpp defaults to.
 include_additional_path="/usr/local/include /usr/contrib/include /opt/gnu/include"
@@ -936,7 +933,6 @@ AC_DEFUN(AC_WITH_EDIT, [
 	LIBEDIT_A="libedit.a"
 	MCEDIT="mcedit"
 	LEDIT="-ledit"
-	CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)"
 	EDIT_msg="yes"
 	AC_MSG_RESULT(will call internal editor)
 ])
diff --git a/edit/Makefile.in b/edit/Makefile.in
index 46f47fde4..e83ecd8df 100644
--- a/edit/Makefile.in
+++ b/edit/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
 @MCFG@@MCF@
 
 CFLAGS = $(XCFLAGS)
-CPPFLAGS = $(XCPPFLAGS)
+CPPFLAGS = $(XCPPFLAGS) -I$(top_srcdir)
 LDFLAGS = $(XLDFLAGS) 
 DEFS = $(XDEFS)
 LIBS = @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ $(XLIB)
diff --git a/gtkedit/Makefile.in b/gtkedit/Makefile.in
index c6f86cfce..8954c2a91 100644
--- a/gtkedit/Makefile.in
+++ b/gtkedit/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
 @MCFG@@MCF@
 
 CFLAGS = $(XCFLAGS)
-CPPFLAGS = $(XCPPFLAGS) @GNOME_INCLUDEDIR@
+CPPFLAGS = $(XCPPFLAGS) @GNOME_INCLUDEDIR@ -I$(top_srcdir)
 LDFLAGS = $(XLDFLAGS) 
 DEFS = $(XDEFS)
 LIBS = @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ $(XLIB)