diff --git a/tools/gst-indent b/tools/gst-indent
index 9309ed38b5..e75338be0d 100755
--- a/tools/gst-indent
+++ b/tools/gst-indent
@@ -23,6 +23,9 @@ case `$INDENT --version` in
       ;;
 esac
 
+# Run twice. GNU indent isn't idempotent
+# when run once
+for i in 1 2; do
 $INDENT \
   --braces-on-if-line \
   --case-brace-indentation0 \
@@ -37,4 +40,5 @@ $INDENT \
   --tab-size8 \
   --indent-level2 \
   --leave-preprocessor-space \
-  $*
+  $* || exit $?
+done