diff --git a/configure.ac b/configure.ac
index 5d0fbd7a5..9301a749b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -596,6 +596,7 @@ vfs/extfs/uzip
 vfs/extfs/uzoo
 
 doc/Makefile 
+doc/hints/Makefile
 doc/man/mc.1 doc/man/mcedit.1 doc/man/mcview.1 doc/man/mcserv.8 doc/man/Makefile
 doc/man/es/mc.1 doc/man/es/Makefile
 doc/man/hu/mc.1 doc/man/hu/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 545f3f907..0260a6993 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
-DIST_SUBDIRS = man es hu it pl ru sr
-SUBDIRS = man $(DOC_LINGUAS)
+DIST_SUBDIRS = hints man es hu it pl ru sr
+SUBDIRS = hints man $(DOC_LINGUAS)
 
 pkgdata_DATA = mc.hlp
 
diff --git a/doc/hints/Makefile.am b/doc/hints/Makefile.am
new file mode 100644
index 000000000..f2e50423f
--- /dev/null
+++ b/doc/hints/Makefile.am
@@ -0,0 +1,11 @@
+LIBFILES_OUT = mc.ext
+
+
+pkgdata_DATA = mc.hint mc.hint.cs mc.hint.es mc.hint.hu mc.hint.it	\
+	mc.hint.nl mc.hint.pl mc.hint.ru mc.hint.sr mc.hint.uk		\
+	mc.hint.zh
+
+
+# Files processed by configure don't need to be here
+EXTRA_DIST = \
+	$(pkgdata_DATA)
diff --git a/lib/mc.hint b/doc/hints/mc.hint
similarity index 100%
rename from lib/mc.hint
rename to doc/hints/mc.hint
diff --git a/lib/mc.hint.cs b/doc/hints/mc.hint.cs
similarity index 100%
rename from lib/mc.hint.cs
rename to doc/hints/mc.hint.cs
diff --git a/lib/mc.hint.es b/doc/hints/mc.hint.es
similarity index 100%
rename from lib/mc.hint.es
rename to doc/hints/mc.hint.es
diff --git a/lib/mc.hint.hu b/doc/hints/mc.hint.hu
similarity index 100%
rename from lib/mc.hint.hu
rename to doc/hints/mc.hint.hu
diff --git a/lib/mc.hint.it b/doc/hints/mc.hint.it
similarity index 100%
rename from lib/mc.hint.it
rename to doc/hints/mc.hint.it
diff --git a/lib/mc.hint.nl b/doc/hints/mc.hint.nl
similarity index 100%
rename from lib/mc.hint.nl
rename to doc/hints/mc.hint.nl
diff --git a/lib/mc.hint.pl b/doc/hints/mc.hint.pl
similarity index 100%
rename from lib/mc.hint.pl
rename to doc/hints/mc.hint.pl
diff --git a/lib/mc.hint.ru b/doc/hints/mc.hint.ru
similarity index 100%
rename from lib/mc.hint.ru
rename to doc/hints/mc.hint.ru
diff --git a/lib/mc.hint.sr b/doc/hints/mc.hint.sr
similarity index 100%
rename from lib/mc.hint.sr
rename to doc/hints/mc.hint.sr
diff --git a/lib/mc.hint.uk b/doc/hints/mc.hint.uk
similarity index 100%
rename from lib/mc.hint.uk
rename to doc/hints/mc.hint.uk
diff --git a/lib/mc.hint.zh b/doc/hints/mc.hint.zh
similarity index 100%
rename from lib/mc.hint.zh
rename to doc/hints/mc.hint.zh
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5f61432b8..b43be9972 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,9 +7,8 @@ LIBFILES_ADD =
 endif
 
 LIBFILES_OUT = mc.ext
-LIBFILES_CONST = mc.hint mc.hint.cs mc.hint.es mc.hint.hu mc.hint.it	\
-	mc.hint.nl mc.hint.pl mc.hint.ru mc.hint.sr mc.hint.uk		\
-	mc.hint.zh mc.lib mc.menu mc.menu.sr cedit.menu edit.indent.rc	\
+
+LIBFILES_CONST =  mc.lib mc.menu mc.menu.sr cedit.menu edit.indent.rc	\
 	edit.spell.rc
 
 noinst_DATA = README.xterm mcserv.init mcserv.pamd xterm.ad