diff --git a/scripts/clang-format b/scripts/clang-format
index d46056c..65cb7a6 100755
--- a/scripts/clang-format
+++ b/scripts/clang-format
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-find . -type f -a '(' -name '*.c' -o -name '*.h' ')' | xargs clang-format -i
+git ls-files | grep '\.[ch]$' | xargs clang-format -i
diff --git a/scripts/clang-format-check b/scripts/clang-format-check
index 983e55d..a75e6b7 100755
--- a/scripts/clang-format-check
+++ b/scripts/clang-format-check
@@ -12,13 +12,16 @@ fi
 errors=0
 paths=$(git ls-files | grep '\.[ch]$')
 for path in $paths; do
+    echo "Checking $path"
+    $CLANG_FORMAT $path > $path.formatted
     in=$(cat $path)
-    out=$($CLANG_FORMAT $path)
+    out=$(cat $path.formatted)
 
     if [ "$in" != "$out" ]; then
-        diff -u -L $path -L "$path.formatted" $path - <<<$out
+        diff -u $path $path.formatted
         errors=1
     fi
+    rm $path.formatted
 done
 
 if [ $errors -ne 0 ]; then