diff --git a/Makefile.am b/Makefile.am
index 73c15d572..e72bf429b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in.
 AUTOMAKE_OPTIONS = 1.5
 
-SUBDIRS = intl po vfs edit src doc syntax contrib misc
+SUBDIRS = intl po vfs src doc syntax contrib misc
 
 EXTRA_DIST = 
 
diff --git a/configure.ac b/configure.ac
index 1375c739d..8f66c08da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -575,6 +575,7 @@ misc/skins/Makefile
 misc/mc.ext
 
 src/Makefile
+src/editor/Makefile
 src/filehighlight/Makefile
 src/mcconfig/Makefile
 src/search/Makefile
@@ -582,7 +583,6 @@ src/skin/Makefile
 src/tty/Makefile
 src/viewer/Makefile
 
-edit/Makefile
 syntax/Makefile
 
 vfs/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 8434f8616..aa7708871 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,9 @@
 SUBDIRS = mcconfig search tty viewer filehighlight skin
 
+if USE_EDIT
+SUBDIRS += editor
+endif
+
 AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
 
 localedir = $(datadir)/locale
@@ -29,7 +33,7 @@ cons_saver_SOURCES = cons.saver.c
 man2hlp_SOURCES = man2hlp.c glibcompat.c
 
 if USE_EDIT
-EDITLIB = ../edit/libedit.a
+EDITLIB = editor/libedit.a
 endif
 
 if ENABLE_VFS
diff --git a/edit/.gitignore b/src/editor/.gitignore
similarity index 100%
rename from edit/.gitignore
rename to src/editor/.gitignore
diff --git a/edit/Makefile.am b/src/editor/Makefile.am
similarity index 100%
rename from edit/Makefile.am
rename to src/editor/Makefile.am
diff --git a/edit/bookmark.c b/src/editor/bookmark.c
similarity index 100%
rename from edit/bookmark.c
rename to src/editor/bookmark.c
diff --git a/edit/choosesyntax.c b/src/editor/choosesyntax.c
similarity index 100%
rename from edit/choosesyntax.c
rename to src/editor/choosesyntax.c
diff --git a/edit/edit-impl.h b/src/editor/edit-impl.h
similarity index 100%
rename from edit/edit-impl.h
rename to src/editor/edit-impl.h
diff --git a/edit/edit-widget.h b/src/editor/edit-widget.h
similarity index 100%
rename from edit/edit-widget.h
rename to src/editor/edit-widget.h
diff --git a/edit/edit.c b/src/editor/edit.c
similarity index 100%
rename from edit/edit.c
rename to src/editor/edit.c
diff --git a/edit/edit.h b/src/editor/edit.h
similarity index 100%
rename from edit/edit.h
rename to src/editor/edit.h
diff --git a/edit/editcmd.c b/src/editor/editcmd.c
similarity index 100%
rename from edit/editcmd.c
rename to src/editor/editcmd.c
diff --git a/edit/editcmd_dialogs.c b/src/editor/editcmd_dialogs.c
similarity index 100%
rename from edit/editcmd_dialogs.c
rename to src/editor/editcmd_dialogs.c
diff --git a/edit/editcmd_dialogs.h b/src/editor/editcmd_dialogs.h
similarity index 100%
rename from edit/editcmd_dialogs.h
rename to src/editor/editcmd_dialogs.h
diff --git a/edit/editdraw.c b/src/editor/editdraw.c
similarity index 100%
rename from edit/editdraw.c
rename to src/editor/editdraw.c
diff --git a/edit/editkeys.c b/src/editor/editkeys.c
similarity index 100%
rename from edit/editkeys.c
rename to src/editor/editkeys.c
diff --git a/edit/editlock.c b/src/editor/editlock.c
similarity index 100%
rename from edit/editlock.c
rename to src/editor/editlock.c
diff --git a/edit/editlock.h b/src/editor/editlock.h
similarity index 100%
rename from edit/editlock.h
rename to src/editor/editlock.h
diff --git a/edit/editmenu.c b/src/editor/editmenu.c
similarity index 100%
rename from edit/editmenu.c
rename to src/editor/editmenu.c
diff --git a/edit/editoptions.c b/src/editor/editoptions.c
similarity index 100%
rename from edit/editoptions.c
rename to src/editor/editoptions.c
diff --git a/edit/editwidget.c b/src/editor/editwidget.c
similarity index 100%
rename from edit/editwidget.c
rename to src/editor/editwidget.c
diff --git a/edit/etags.c b/src/editor/etags.c
similarity index 100%
rename from edit/etags.c
rename to src/editor/etags.c
diff --git a/edit/etags.h b/src/editor/etags.h
similarity index 100%
rename from edit/etags.h
rename to src/editor/etags.h
diff --git a/edit/syntax.c b/src/editor/syntax.c
similarity index 100%
rename from edit/syntax.c
rename to src/editor/syntax.c
diff --git a/edit/wordproc.c b/src/editor/wordproc.c
similarity index 100%
rename from edit/wordproc.c
rename to src/editor/wordproc.c