diff --git a/scripts/check_format.sh b/scripts/check_format.sh
index 8cd3c6009..44d43e8e3 100755
--- a/scripts/check_format.sh
+++ b/scripts/check_format.sh
@@ -30,4 +30,7 @@ else
 	exit 0
 fi
 
+git ls-files -z '*.c' '*.cpp' '*.h' '*.txt' '*.md' '*.mk' '*.txt' '*.sh' '*.py' | \
+	xargs -0 -P8 -n1 scripts/eofnl
+
 exit 0
diff --git a/scripts/eofnl b/scripts/eofnl
new file mode 100755
index 000000000..a193b5da4
--- /dev/null
+++ b/scripts/eofnl
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Make sure file has a trailing newline
+
+f="$1"
+
+if [ -z "$f" ]; then
+	echo "usage: $0 <file>"
+	exit 1
+fi
+
+if [[ -f "$f" && $(tail -c1 "$f") ]]; then
+	echo "$f: No newline at end of file"
+	echo '' >> "$f"
+	exit 1
+else
+	exit 0
+fi