diff --git a/build-utils/atoms-ext.sh b/build-utils/atoms-ext.sh
index 59ba03a38..3822dcdb8 100755
--- a/build-utils/atoms-ext.sh
+++ b/build-utils/atoms-ext.sh
@@ -7,3 +7,5 @@ while read atom
 do
     echo extern xcb_atom_t $atom\;
 done < $1
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/build-utils/atoms-int.sh b/build-utils/atoms-int.sh
index 5f8f127f5..0c75ba829 100755
--- a/build-utils/atoms-int.sh
+++ b/build-utils/atoms-int.sh
@@ -18,3 +18,5 @@ do
 done < $1
 
 echo '};'
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/build-utils/dist.sh b/build-utils/dist.sh
index 7aa290bf7..d64bb26f3 100755
--- a/build-utils/dist.sh
+++ b/build-utils/dist.sh
@@ -11,3 +11,5 @@ cd dist
 echo -n $VERSION > awesome-$SVERSION/.version_stamp
 tar cjf awesome-$SVERSION.tar.bz2 awesome-$SVERSION
 tar cJf awesome-$SVERSION.tar.xz awesome-$SVERSION
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/build-utils/git-version-stamp.sh b/build-utils/git-version-stamp.sh
index 039470007..0e676de6e 100755
--- a/build-utils/git-version-stamp.sh
+++ b/build-utils/git-version-stamp.sh
@@ -29,3 +29,5 @@ then
     mv "$2.new" "$2"
     echo -n "$CURRENT" > "$1"
 fi
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/build-utils/lgi-check.sh b/build-utils/lgi-check.sh
index 0f7ad78e8..f315513dc 100755
--- a/build-utils/lgi-check.sh
+++ b/build-utils/lgi-check.sh
@@ -33,3 +33,5 @@ lua -e '_, _, major_minor, patch = string.find(require("lgi.version"), "^(%d%.%d
 
 # Check for the needed gi files
 lua -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo, l.GLib, l.Gio)' || die
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/build-utils/travis-apidoc.sh b/build-utils/travis-apidoc.sh
index 67f4bdea7..0ceab5ed7 100755
--- a/build-utils/travis-apidoc.sh
+++ b/build-utils/travis-apidoc.sh
@@ -107,3 +107,5 @@ if [ "$TRAVIS_PULL_REQUEST" != false ]; then
     -d "{\"body\": \"Documentation has been updated for this PR:\n$COMPARE_LINKS\"}" \
     https://api.github.com/repos/awesomeWM/awesome/issues/${TRAVIS_PULL_REQUEST}/comments
 fi
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/tests/run.sh b/tests/run.sh
index 70a808327..4938594ba 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -184,3 +184,5 @@ if ! [ $errors = 0 ]; then
     exit 1
 fi
 exit 0
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/utils/awesome-client b/utils/awesome-client
index 72555d333..5ffa7ec60 100755
--- a/utils/awesome-client
+++ b/utils/awesome-client
@@ -62,3 +62,5 @@ then
 else
     a_dbus_send "$(cat)"
 fi
+
+# vim: filetype=sh:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80