diff --git a/ChangeLog b/ChangeLog
index e32c2c5..73f174b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-04  Ben Elliston  <bje@gnu.org>
+
+	* Makefile (shellcheck): New.
+
 2018-05-01  Ben Elliston  <bje@gnu.org>
 
 	* config.sub (maybe_os): Reindent this block.
diff --git a/Makefile b/Makefile
index 5aa3200..a56d973 100644
--- a/Makefile
+++ b/Makefile
@@ -15,3 +15,6 @@ check-guess:
 
 check-sub:
 	cd testsuite && sh config-sub.sh
+
+shellcheck:
+	shellcheck -e SC2006 -f gcc config.guess config.sub