diff --git a/.travis.yml b/.travis.yml
index 75141e0ef3a..cbf6c75e29f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,7 @@ before_install:
 script:
 - export SERENITY_ROOT=$(pwd)
 - Meta/lint-shell-scripts.sh
+- Meta/lint-executable-resources.sh
 - Meta/check-style.sh
 - cd Toolchain
 - TRY_USE_LOCAL_TOOLCHAIN=y ./BuildIt.sh
diff --git a/Meta/lint-executable-resources.sh b/Meta/lint-executable-resources.sh
new file mode 100755
index 00000000000..de14f2918de
--- /dev/null
+++ b/Meta/lint-executable-resources.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e pipefail
+
+script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
+cd "$script_path/.."
+
+BAD_FILES=$(find Base/etc/ Base/res/ Base/www/ -type f -executable)
+
+if [ -n "${BAD_FILES}" ]
+then
+    echo "These files are marked as executable, but are in directories that do not commonly"
+    echo "contain executables. Please double-check the permissions of these files:"
+    echo "${BAD_FILES}" | xargs ls -ld
+    exit 1
+fi