diff --git a/Makefile.am b/Makefile.am
index 90e5b779d..ab4f9b7eb 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 lib src doc syntax contrib misc
+SUBDIRS = intl po lib src doc contrib misc
 
 EXTRA_DIST = 
 
diff --git a/configure.ac b/configure.ac
index 5eb555a59..80713d466 100644
--- a/configure.ac
+++ b/configure.ac
@@ -613,7 +613,7 @@ lib/vfs/mc-vfs/extfs/urar
 lib/vfs/mc-vfs/extfs/uzip
 lib/vfs/mc-vfs/extfs/uzoo
 
-syntax/Makefile
+misc/syntax/Makefile
 
 doc/Makefile
 doc/hints/Makefile
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 527678d62..41bc7e514 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in.
 
-SUBDIRS = skins
+SUBDIRS = skins syntax
 
 LIBFILES_OUT = mc.ext
 
diff --git a/syntax/Makefile.am b/misc/syntax/Makefile.am
similarity index 100%
rename from syntax/Makefile.am
rename to misc/syntax/Makefile.am
diff --git a/syntax/PKGBUILD.syntax b/misc/syntax/PKGBUILD.syntax
similarity index 100%
rename from syntax/PKGBUILD.syntax
rename to misc/syntax/PKGBUILD.syntax
diff --git a/syntax/Syntax b/misc/syntax/Syntax
similarity index 100%
rename from syntax/Syntax
rename to misc/syntax/Syntax
diff --git a/syntax/ada95.syntax b/misc/syntax/ada95.syntax
similarity index 100%
rename from syntax/ada95.syntax
rename to misc/syntax/ada95.syntax
diff --git a/syntax/aspx.syntax b/misc/syntax/aspx.syntax
similarity index 100%
rename from syntax/aspx.syntax
rename to misc/syntax/aspx.syntax
diff --git a/syntax/assembler.syntax b/misc/syntax/assembler.syntax
similarity index 100%
rename from syntax/assembler.syntax
rename to misc/syntax/assembler.syntax
diff --git a/syntax/awk.syntax b/misc/syntax/awk.syntax
similarity index 100%
rename from syntax/awk.syntax
rename to misc/syntax/awk.syntax
diff --git a/syntax/c.syntax b/misc/syntax/c.syntax
similarity index 100%
rename from syntax/c.syntax
rename to misc/syntax/c.syntax
diff --git a/syntax/cabal.syntax b/misc/syntax/cabal.syntax
similarity index 100%
rename from syntax/cabal.syntax
rename to misc/syntax/cabal.syntax
diff --git a/syntax/changelog.syntax b/misc/syntax/changelog.syntax
similarity index 100%
rename from syntax/changelog.syntax
rename to misc/syntax/changelog.syntax
diff --git a/syntax/cs.syntax b/misc/syntax/cs.syntax
similarity index 100%
rename from syntax/cs.syntax
rename to misc/syntax/cs.syntax
diff --git a/syntax/css.syntax b/misc/syntax/css.syntax
similarity index 100%
rename from syntax/css.syntax
rename to misc/syntax/css.syntax
diff --git a/syntax/cxx.syntax b/misc/syntax/cxx.syntax
similarity index 100%
rename from syntax/cxx.syntax
rename to misc/syntax/cxx.syntax
diff --git a/syntax/d.syntax b/misc/syntax/d.syntax
similarity index 100%
rename from syntax/d.syntax
rename to misc/syntax/d.syntax
diff --git a/syntax/debian-changelog.syntax b/misc/syntax/debian-changelog.syntax
similarity index 100%
rename from syntax/debian-changelog.syntax
rename to misc/syntax/debian-changelog.syntax
diff --git a/syntax/debian-control.syntax b/misc/syntax/debian-control.syntax
similarity index 100%
rename from syntax/debian-control.syntax
rename to misc/syntax/debian-control.syntax
diff --git a/syntax/debian-description.syntax b/misc/syntax/debian-description.syntax
similarity index 100%
rename from syntax/debian-description.syntax
rename to misc/syntax/debian-description.syntax
diff --git a/syntax/debian-sources-list.syntax b/misc/syntax/debian-sources-list.syntax
similarity index 100%
rename from syntax/debian-sources-list.syntax
rename to misc/syntax/debian-sources-list.syntax
diff --git a/syntax/diff.syntax b/misc/syntax/diff.syntax
similarity index 100%
rename from syntax/diff.syntax
rename to misc/syntax/diff.syntax
diff --git a/syntax/dos.syntax b/misc/syntax/dos.syntax
similarity index 100%
rename from syntax/dos.syntax
rename to misc/syntax/dos.syntax
diff --git a/syntax/ebuild.syntax b/misc/syntax/ebuild.syntax
similarity index 100%
rename from syntax/ebuild.syntax
rename to misc/syntax/ebuild.syntax
diff --git a/syntax/eiffel.syntax b/misc/syntax/eiffel.syntax
similarity index 100%
rename from syntax/eiffel.syntax
rename to misc/syntax/eiffel.syntax
diff --git a/syntax/erlang.syntax b/misc/syntax/erlang.syntax
similarity index 100%
rename from syntax/erlang.syntax
rename to misc/syntax/erlang.syntax
diff --git a/syntax/f90.syntax b/misc/syntax/f90.syntax
similarity index 100%
rename from syntax/f90.syntax
rename to misc/syntax/f90.syntax
diff --git a/syntax/filehighlight.syntax b/misc/syntax/filehighlight.syntax
similarity index 100%
rename from syntax/filehighlight.syntax
rename to misc/syntax/filehighlight.syntax
diff --git a/syntax/fortran.syntax b/misc/syntax/fortran.syntax
similarity index 100%
rename from syntax/fortran.syntax
rename to misc/syntax/fortran.syntax
diff --git a/syntax/haskell.syntax b/misc/syntax/haskell.syntax
similarity index 100%
rename from syntax/haskell.syntax
rename to misc/syntax/haskell.syntax
diff --git a/syntax/html.syntax b/misc/syntax/html.syntax
similarity index 100%
rename from syntax/html.syntax
rename to misc/syntax/html.syntax
diff --git a/syntax/idl.syntax b/misc/syntax/idl.syntax
similarity index 100%
rename from syntax/idl.syntax
rename to misc/syntax/idl.syntax
diff --git a/syntax/j.syntax b/misc/syntax/j.syntax
similarity index 100%
rename from syntax/j.syntax
rename to misc/syntax/j.syntax
diff --git a/syntax/java.syntax b/misc/syntax/java.syntax
similarity index 100%
rename from syntax/java.syntax
rename to misc/syntax/java.syntax
diff --git a/syntax/js.syntax b/misc/syntax/js.syntax
similarity index 100%
rename from syntax/js.syntax
rename to misc/syntax/js.syntax
diff --git a/syntax/latex.syntax b/misc/syntax/latex.syntax
similarity index 100%
rename from syntax/latex.syntax
rename to misc/syntax/latex.syntax
diff --git a/syntax/lisp.syntax b/misc/syntax/lisp.syntax
similarity index 100%
rename from syntax/lisp.syntax
rename to misc/syntax/lisp.syntax
diff --git a/syntax/lsm.syntax b/misc/syntax/lsm.syntax
similarity index 100%
rename from syntax/lsm.syntax
rename to misc/syntax/lsm.syntax
diff --git a/syntax/lua.syntax b/misc/syntax/lua.syntax
similarity index 100%
rename from syntax/lua.syntax
rename to misc/syntax/lua.syntax
diff --git a/syntax/m4.syntax b/misc/syntax/m4.syntax
similarity index 100%
rename from syntax/m4.syntax
rename to misc/syntax/m4.syntax
diff --git a/syntax/mail.syntax b/misc/syntax/mail.syntax
similarity index 100%
rename from syntax/mail.syntax
rename to misc/syntax/mail.syntax
diff --git a/syntax/makefile.syntax b/misc/syntax/makefile.syntax
similarity index 100%
rename from syntax/makefile.syntax
rename to misc/syntax/makefile.syntax
diff --git a/syntax/ml.syntax b/misc/syntax/ml.syntax
similarity index 100%
rename from syntax/ml.syntax
rename to misc/syntax/ml.syntax
diff --git a/syntax/named.syntax b/misc/syntax/named.syntax
similarity index 100%
rename from syntax/named.syntax
rename to misc/syntax/named.syntax
diff --git a/syntax/nemerle.syntax b/misc/syntax/nemerle.syntax
similarity index 100%
rename from syntax/nemerle.syntax
rename to misc/syntax/nemerle.syntax
diff --git a/syntax/nroff.syntax b/misc/syntax/nroff.syntax
similarity index 100%
rename from syntax/nroff.syntax
rename to misc/syntax/nroff.syntax
diff --git a/syntax/octave.syntax b/misc/syntax/octave.syntax
similarity index 100%
rename from syntax/octave.syntax
rename to misc/syntax/octave.syntax
diff --git a/syntax/pascal.syntax b/misc/syntax/pascal.syntax
similarity index 100%
rename from syntax/pascal.syntax
rename to misc/syntax/pascal.syntax
diff --git a/syntax/perl.syntax b/misc/syntax/perl.syntax
similarity index 100%
rename from syntax/perl.syntax
rename to misc/syntax/perl.syntax
diff --git a/syntax/php.syntax b/misc/syntax/php.syntax
similarity index 100%
rename from syntax/php.syntax
rename to misc/syntax/php.syntax
diff --git a/syntax/po.syntax b/misc/syntax/po.syntax
similarity index 100%
rename from syntax/po.syntax
rename to misc/syntax/po.syntax
diff --git a/syntax/povray.syntax b/misc/syntax/povray.syntax
similarity index 100%
rename from syntax/povray.syntax
rename to misc/syntax/povray.syntax
diff --git a/syntax/procmail.syntax b/misc/syntax/procmail.syntax
similarity index 100%
rename from syntax/procmail.syntax
rename to misc/syntax/procmail.syntax
diff --git a/syntax/properties.syntax b/misc/syntax/properties.syntax
similarity index 100%
rename from syntax/properties.syntax
rename to misc/syntax/properties.syntax
diff --git a/syntax/python.syntax b/misc/syntax/python.syntax
similarity index 100%
rename from syntax/python.syntax
rename to misc/syntax/python.syntax
diff --git a/syntax/ruby.syntax b/misc/syntax/ruby.syntax
similarity index 100%
rename from syntax/ruby.syntax
rename to misc/syntax/ruby.syntax
diff --git a/syntax/sh.syntax b/misc/syntax/sh.syntax
similarity index 100%
rename from syntax/sh.syntax
rename to misc/syntax/sh.syntax
diff --git a/syntax/slang.syntax b/misc/syntax/slang.syntax
similarity index 100%
rename from syntax/slang.syntax
rename to misc/syntax/slang.syntax
diff --git a/syntax/smalltalk.syntax b/misc/syntax/smalltalk.syntax
similarity index 100%
rename from syntax/smalltalk.syntax
rename to misc/syntax/smalltalk.syntax
diff --git a/syntax/spec.syntax b/misc/syntax/spec.syntax
similarity index 100%
rename from syntax/spec.syntax
rename to misc/syntax/spec.syntax
diff --git a/syntax/sql.syntax b/misc/syntax/sql.syntax
similarity index 100%
rename from syntax/sql.syntax
rename to misc/syntax/sql.syntax
diff --git a/syntax/strace.syntax b/misc/syntax/strace.syntax
similarity index 100%
rename from syntax/strace.syntax
rename to misc/syntax/strace.syntax
diff --git a/syntax/swig.syntax b/misc/syntax/swig.syntax
similarity index 100%
rename from syntax/swig.syntax
rename to misc/syntax/swig.syntax
diff --git a/syntax/syntax.syntax b/misc/syntax/syntax.syntax
similarity index 100%
rename from syntax/syntax.syntax
rename to misc/syntax/syntax.syntax
diff --git a/syntax/tcl.syntax b/misc/syntax/tcl.syntax
similarity index 100%
rename from syntax/tcl.syntax
rename to misc/syntax/tcl.syntax
diff --git a/syntax/texinfo.syntax b/misc/syntax/texinfo.syntax
similarity index 100%
rename from syntax/texinfo.syntax
rename to misc/syntax/texinfo.syntax
diff --git a/syntax/tt.syntax b/misc/syntax/tt.syntax
similarity index 100%
rename from syntax/tt.syntax
rename to misc/syntax/tt.syntax
diff --git a/syntax/unknown.syntax b/misc/syntax/unknown.syntax
similarity index 100%
rename from syntax/unknown.syntax
rename to misc/syntax/unknown.syntax
diff --git a/syntax/verilog.syntax b/misc/syntax/verilog.syntax
similarity index 100%
rename from syntax/verilog.syntax
rename to misc/syntax/verilog.syntax
diff --git a/syntax/vhdl.syntax b/misc/syntax/vhdl.syntax
similarity index 100%
rename from syntax/vhdl.syntax
rename to misc/syntax/vhdl.syntax
diff --git a/syntax/xml.syntax b/misc/syntax/xml.syntax
similarity index 100%
rename from syntax/xml.syntax
rename to misc/syntax/xml.syntax
diff --git a/syntax/yum-repo.syntax b/misc/syntax/yum-repo.syntax
similarity index 100%
rename from syntax/yum-repo.syntax
rename to misc/syntax/yum-repo.syntax
diff --git a/syntax/yxx.syntax b/misc/syntax/yxx.syntax
similarity index 100%
rename from syntax/yxx.syntax
rename to misc/syntax/yxx.syntax