diff --git a/Makefile.am b/Makefile.am
index ec5b4dc3b..3295f8130 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -115,7 +115,7 @@ cppcheck-split-all: \
     cppcheck-unusedFunction \
     cppcheck-missingInclude
 
-INDENT_CMD = indent \
+INDENT_CMD = $(INDENT) \
     --gnu-style \
     --format-first-column-comments \
     --indent-level4 \
diff --git a/configure.ac b/configure.ac
index 5cf1f2f74..12556f563 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,6 +212,7 @@ dnl Check for other tools
 dnl ############################################################################
 
 AC_CHECK_TOOL(AR, ar, ar)
+AC_CHECK_TOOL(INDENT, gindent, indent)
 mc_UNIT_TESTS