diff --git a/tools/check-makefile.sh b/tools/check-makefile.sh
new file mode 100755
index 00000000..84725a23
--- /dev/null
+++ b/tools/check-makefile.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+echo Check makefiles for missing .c or .h files
+
+cd `dirname $0`/..
+
+for i in `git ls-files *.c *.h`; do
+	pushd `dirname $i` >/dev/null
+	f=`basename $i`
+	if ! grep -q $f Makefile.am; then
+		echo $i
+	fi
+	popd >/dev/null
+done