diff --git a/edit/edit-widget.h b/edit/edit-widget.h
index 2fce99ecf..0c9ec7284 100644
--- a/edit/edit-widget.h
+++ b/edit/edit-widget.h
@@ -2,7 +2,7 @@
 #define MC_EDIT_WIDGET_H
 
 #include "../src/dialog.h"		/* Widget */
-#include "../src/search.h"		/* mc_search_t */
+#include "../src/search/search.h"		/* mc_search_t */
 #include "edit.h"
 
 #define MAX_MACRO_LENGTH 1024
diff --git a/src/Makefile.am b/src/Makefile.am
index 3665cdad2..3aab1898b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,6 +39,8 @@ mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
 
 CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h
 
+MC_MODULE_SEARCH_FILES = search/search.c search/search.h
+
 SRCS =	achown.c achown.h background.c background.h boxes.c boxes.h	\
 	chmod.c chmod.h chown.c chown.h cmd.c cmd.h color.c color.h	\
 	command.c command.h complete.c cons.handler.c	\
@@ -61,7 +63,7 @@ SRCS =	achown.c achown.h background.c background.h boxes.c boxes.h	\
 	widget.h win.c win.h wtools.c wtools.h unixcompat.h		\
 	x11conn.h x11conn.c ecs.h ecs.c \
 	strutil.h strutil.c strutilascii.c strutil8bit.c strutilutf8.c \
-	search.c search.h
+	$(MC_MODULE_SEARCH_FILES)
 
 if CHARSET
 mc_SOURCES = $(SRCS) $(CHARSET_SRC)
diff --git a/src/search.c b/src/search/search.c
similarity index 100%
rename from src/search.c
rename to src/search/search.c
diff --git a/src/search.h b/src/search/search.h
similarity index 100%
rename from src/search.h
rename to src/search/search.h