diff --git a/configure.ac b/configure.ac
index ea29612cf..5d3357022 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ dnl
 AC_INIT([GNU Midnight Commander], [], [mc-devel@gnome.org])
 AC_PREREQ(2.60)
 m4_pattern_forbid(MC_)
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/main.c)
 AC_CONFIG_AUX_DIR(config)
 MC_VERSION
@@ -484,7 +485,7 @@ esac
 
 dnl Support for background operations
 AC_ARG_ENABLE([background],
-	      [  --enable-background      Support for background file operations [[yes]]])
+	      [  --enable-background     Support for background file operations [[yes]]])
 if test "x$enable_background" != xno; then
     AC_DEFINE(WITH_BACKGROUND, 1, [Define to enable background file operations])
 fi
@@ -494,7 +495,7 @@ dnl
 dnl User visible support for charset conversion.
 dnl
 AC_ARG_ENABLE([charset],
-	      [  --enable-charset         Support for charset selection and conversion [[no]]])
+	      [  --enable-charset        Support for charset selection and conversion [[no]]])
 have_charset=
 charset_msg="no"
 if test "x$enable_charset" = xyes; then
diff --git a/m4.include/mc-check-search-type.m4 b/m4.include/mc-check-search-type.m4
index 595c23857..670cb0975 100644
--- a/m4.include/mc-check-search-type.m4
+++ b/m4.include/mc-check-search-type.m4
@@ -10,8 +10,8 @@ dnl @copyright Free Software Foundation, Inc.
 AC_DEFUN([MC_CHECK_SEARCH_TYPE],[
 
     AC_ARG_WITH([search-engine],
-        AC_HELP_STRING([--search-engine=type],
-        [Select low-level search engine (since glib >= 2.14). [[glib pcre]]])
+        AC_HELP_STRING([--with-search-engine=type],
+        [Select low-level search engine (since glib >= 2.14). [[glib|pcre]]])
       )
     case x$with_search_engine in
     xglib)
diff --git a/m4.include/mc-mcserver.m4 b/m4.include/mc-mcserver.m4
index 94be05df7..ff59982e8 100644
--- a/m4.include/mc-mcserver.m4
+++ b/m4.include/mc-mcserver.m4
@@ -10,7 +10,7 @@ AC_DEFUN([MC_MCSERVER_CHECKS], [
     dnl mcfs support
     dnl
     AC_ARG_ENABLE([mcserver],
-        [  --enable-mcserver              Support mc-specific networking file system server [[no]]],
+        [  --enable-mcserver       Support mc-specific networking file system server [[no]]],
         [if test "x$enableval" != "xno"; then
             AC_DEFINE(ENABLE_MCSERVER, 1, [Define to enable mc-specific networking file system server])
             AC_MC_VFS_ADDNAME([mcfs])
diff --git a/m4.include/mc-vfs.m4 b/m4.include/mc-vfs.m4
index f9cded493..d5ca7ebbe 100644
--- a/m4.include/mc-vfs.m4
+++ b/m4.include/mc-vfs.m4
@@ -34,7 +34,7 @@ AC_DEFUN([MC_WITH_VFS],
     use_net_code=false
 
     AC_ARG_ENABLE([netcode],
-		[  --enable-netcode         Support for networking [[yes]]])
+		[  --enable-netcode        Support for networking [[yes]]])
 
     if test "x$enable_netcode" != xno; then
 	dnl FIXME: network checks should probably be in their own macro.
diff --git a/m4.include/vfs/mc-mvfs.m4 b/m4.include/vfs/mc-mvfs.m4
index 2be03c792..b19258a62 100644
--- a/m4.include/vfs/mc-mvfs.m4
+++ b/m4.include/vfs/mc-mvfs.m4
@@ -19,7 +19,7 @@ AC_DEFUN([AC_REQUIRE_MVFS],
 
 AC_DEFUN([AC_MVFS_FS], [
     AC_PREPARE_MVFS
-    AC_ARG_ENABLE([mvfs-$1],[  --enable-mvfs-$1    Support for $3 (via libmvfs)])
+    AC_ARG_ENABLE([mvfs-$1],[  --enable-mvfs-$1     Support for $3 (via libmvfs)])
     if test x"$enable_mvfs_$1" = x"yes" ; then
 	AC_REQUIRE_MVFS
 	AC_DEFINE(ENABLE_MVFS_$2, 1, [$1 (via libmvfs)])
diff --git a/m4.include/vfs/mc-vfs-cpiofs.m4 b/m4.include/vfs/mc-vfs-cpiofs.m4
index 76d5f798e..176fbab48 100644
--- a/m4.include/vfs/mc-vfs-cpiofs.m4
+++ b/m4.include/vfs/mc-vfs-cpiofs.m4
@@ -2,11 +2,11 @@ dnl CPIO filesystem support
 AC_DEFUN([AC_MC_VFS_CPIOFS],
 [
     AC_ARG_ENABLE([vfs-cpio],
-                  [  --disable-vfs-cpio    Support for cpio filesystem [[yes]]])
+                  [  --enable-vfs-cpio       Support for cpio filesystem [[yes]]])
     if test x"$enable_vfs_cpio" != x"no"; then
+	enable_vfs_cpio="yes"
 	AC_DEFINE([ENABLE_VFS_CPIO], [1], [Support for cpio filesystem])
 	AC_MC_VFS_ADDNAME([cpio])
-	enable_vfs_cpio="yes"
     fi
     AM_CONDITIONAL(ENABLE_VFS_CPIO, [test x"$enable_vfs_cpio" = x"yes"])
 ])
diff --git a/m4.include/vfs/mc-vfs-extfs.m4 b/m4.include/vfs/mc-vfs-extfs.m4
index 4bd83e43e..07afb05b6 100644
--- a/m4.include/vfs/mc-vfs-extfs.m4
+++ b/m4.include/vfs/mc-vfs-extfs.m4
@@ -24,7 +24,7 @@ dnl Enable Extfs (classic)
 AC_DEFUN([AC_MC_VFS_EXTFS],
 [
     AC_ARG_ENABLE([vfs-extfs],
-              [  --disable-vfs-extfs       Support for extfs [[yes]]])
+              [  --enable-vfs-extfs      Support for extfs [[yes]]])
     if test x"$enable_vfs_extfs" != x"no"; then
 	AC_MC_EXTFS_CHECKS
 	enable_vfs_extfs="yes"
diff --git a/m4.include/vfs/mc-vfs-fish.m4 b/m4.include/vfs/mc-vfs-fish.m4
index 53677b148..d44a5b80e 100644
--- a/m4.include/vfs/mc-vfs-fish.m4
+++ b/m4.include/vfs/mc-vfs-fish.m4
@@ -2,7 +2,7 @@ dnl Enable FISH protocol (classic)
 AC_DEFUN([AC_MC_VFS_FISH],
 [
     AC_ARG_ENABLE([vfs-fish],
-                  [  --disable-vfs-fish           Support for FISH vfs [[yes]]])
+                  [  --enable-vfs-fish       Support for FISH vfs [[yes]]])
     if test "x$enable_vfs_fish" != xno; then
         enable_vfs_fish="yes"
 	AC_MC_VFS_ADDNAME([fish])
diff --git a/m4.include/vfs/mc-vfs-ftp.m4 b/m4.include/vfs/mc-vfs-ftp.m4
index 15ec15100..6dcba8db5 100644
--- a/m4.include/vfs/mc-vfs-ftp.m4
+++ b/m4.include/vfs/mc-vfs-ftp.m4
@@ -2,7 +2,7 @@ dnl Enable FTP filesystem (classic)
 AC_DEFUN([AC_MC_VFS_FTP],
 [
     AC_ARG_ENABLE([vfs-ftp],
-		  [  --disable-vfs-ftp     Support for FTP vfs [[yes]]])
+		  [  --enable-vfs-ftp        Support for FTP vfs [[yes]]])
     if test x"$enable_vfs_ftp" != x"no"; then
 	enable_vfs_ftp="yes"
 	AC_MC_VFS_ADDNAME([ftp])
diff --git a/m4.include/vfs/mc-vfs-mcfs.m4 b/m4.include/vfs/mc-vfs-mcfs.m4
index 29e0d665c..7fc6f82a5 100644
--- a/m4.include/vfs/mc-vfs-mcfs.m4
+++ b/m4.include/vfs/mc-vfs-mcfs.m4
@@ -10,7 +10,7 @@ AC_DEFUN([AC_MC_VFS_MCFS_SET],
 AC_DEFUN([AC_MC_VFS_MCFS],
 [
     AC_ARG_ENABLE([vfs-mcfs],
-                  [  --enable-vfs-mcfs    Enable Support MCFS (mc's network filesystem)])
+                  [  --enable-vfs-mcfs       Enable Support MCFS (mc's network filesystem)])
     if test x"$enable_vfs_mcfs" = x"yes" ; then
         AC_MC_VFS_MCFS_SET
     fi
diff --git a/m4.include/vfs/mc-vfs-sfs.m4 b/m4.include/vfs/mc-vfs-sfs.m4
index 05610296c..f2db2d3ba 100644
--- a/m4.include/vfs/mc-vfs-sfs.m4
+++ b/m4.include/vfs/mc-vfs-sfs.m4
@@ -2,7 +2,7 @@ dnl SFS support
 AC_DEFUN([AC_MC_VFS_SFS],
 [
     AC_ARG_ENABLE([sfs],
-                  [  --disable-vfs-sfs         Support for sfs [[yes]]])
+                  [  --enable-vfs-sfs        Support for sfs [[yes]]])
     if test x"$enable_vfs_sfs" != x"no"; then
 	enable_vfs_sfs="yes"
 	AC_MC_VFS_ADDNAME([sfs])
diff --git a/m4.include/vfs/mc-vfs-tarfs.m4 b/m4.include/vfs/mc-vfs-tarfs.m4
index b1da9f96b..5cfd825a7 100644
--- a/m4.include/vfs/mc-vfs-tarfs.m4
+++ b/m4.include/vfs/mc-vfs-tarfs.m4
@@ -2,7 +2,7 @@ dnl TAR filesystem support
 AC_DEFUN([AC_MC_VFS_TARFS],
 [
     AC_ARG_ENABLE([vfs-tar],
-                  [  --disable-vfs-tar     Support for tar filesystem [[yes]]])
+                  [  --enable-vfs-tar        Support for tar filesystem [[yes]]])
     if test x"$enable_vfs_tar" != x"no"; then
 	enable_vfs_tar="yes"
 	AC_MC_VFS_ADDNAME([tar])
diff --git a/m4.include/vfs/mc-vfs-undelfs.m4 b/m4.include/vfs/mc-vfs-undelfs.m4
index a453d3cbf..0cb78fbc2 100644
--- a/m4.include/vfs/mc-vfs-undelfs.m4
+++ b/m4.include/vfs/mc-vfs-undelfs.m4
@@ -50,7 +50,7 @@ dnl
 AC_DEFUN([AC_MC_VFS_UNDELFS],
 [
     AC_ARG_ENABLE([undelfs],
-                  [  --enable-vfs-undelfs     Support for ext2 undelete filesystem])
+                  [  --enable-vfs-undelfs    Support for ext2 undelete filesystem])
 
     if test x"$enable_vfs_undelfs" = x"yes" ; then