diff --git a/tools/gst-indent b/tools/gst-indent
index 1d088f19c3..b3cff4793c 100755
--- a/tools/gst-indent
+++ b/tools/gst-indent
@@ -1,5 +1,29 @@
 #!/bin/sh
-indent \
+
+version=`gnuindent --version 2>/dev/null`
+if test "x$version" = "x"; then
+  version=`indent --version 2>/dev/null`
+  if test "x$version" = "x"; then
+    echo "GStreamer git pre-commit hook:"
+    echo "Did not find GNU indent, please install it before continuing."
+    exit 1
+  fi
+  INDENT=indent
+else
+  INDENT=gnuindent
+fi
+
+case `$INDENT --version` in
+  GNU*)
+      ;;
+  default)
+      echo "Did not find GNU indent, please install it before continuing."
+      echo "(Found $INDENT, but it doesn't seem to be GNU indent)"
+      exit 1
+      ;;
+esac
+
+$INDENT \
   --braces-on-if-line \
   --case-brace-indentation0 \
   --case-indentation2 \