diff --git a/functions b/functions
index 15901662b8..0bbf477fa9 100644
--- a/functions
+++ b/functions
@@ -1356,5 +1356,5 @@ $XTRACE
 
 
 # Local variables:
-# -*- mode: Shell-script -*-
+# mode: shell-script
 # End:
diff --git a/lib/baremetal b/lib/baremetal
index 5326dd1ff1..24cce9f7dd 100644
--- a/lib/baremetal
+++ b/lib/baremetal
@@ -434,3 +434,7 @@ function add_baremetal_node() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/ceilometer b/lib/ceilometer
index d90694c513..58cafd1d79 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -138,3 +138,7 @@ function stop_ceilometer() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/cinder b/lib/cinder
index 7688ad9903..7afd69bdc8 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -431,3 +431,7 @@ function stop_cinder() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/database b/lib/database
index 79b77a267b..cbe886f5c8 100644
--- a/lib/database
+++ b/lib/database
@@ -114,3 +114,7 @@ function database_connection_url {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/databases/mysql b/lib/databases/mysql
index 0633ab046e..30450b1caf 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -139,3 +139,7 @@ function database_connection_url_mysql {
 
 # Restore xtrace
 $MY_XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/databases/postgresql b/lib/databases/postgresql
index efc206fa27..b64de2c95e 100644
--- a/lib/databases/postgresql
+++ b/lib/databases/postgresql
@@ -90,3 +90,7 @@ function database_connection_url_postgresql {
 
 # Restore xtrace
 $PG_XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/glance b/lib/glance
index e9d05622f8..aa101e10da 100644
--- a/lib/glance
+++ b/lib/glance
@@ -206,3 +206,7 @@ function stop_glance() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/heat b/lib/heat
index 56d6f396ff..88535c352e 100644
--- a/lib/heat
+++ b/lib/heat
@@ -184,3 +184,7 @@ function stop_heat() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/horizon b/lib/horizon
index bc739ed521..b63e1f8b01 100644
--- a/lib/horizon
+++ b/lib/horizon
@@ -178,3 +178,7 @@ function stop_horizon() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/keystone b/lib/keystone
index 805cb6f045..875d537d8b 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -346,3 +346,7 @@ function stop_keystone() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/ldap b/lib/ldap
index 9d415c5a84..53f68377b5 100644
--- a/lib/ldap
+++ b/lib/ldap
@@ -76,3 +76,7 @@ function clear_ldap_state() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/nova b/lib/nova
index 61c05a11cf..91fe0280c0 100644
--- a/lib/nova
+++ b/lib/nova
@@ -680,3 +680,7 @@ function stop_nova() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/quantum b/lib/quantum
index efdd43d071..61b89f7b0e 100644
--- a/lib/quantum
+++ b/lib/quantum
@@ -761,3 +761,7 @@ function stop_quantum_third_party() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/rpc_backend b/lib/rpc_backend
index bbd51f0cdf..d08cb01f06 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -159,3 +159,7 @@ function qpid_is_supported() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/swift b/lib/swift
index 783ec7503a..5931acc405 100644
--- a/lib/swift
+++ b/lib/swift
@@ -429,3 +429,7 @@ function stop_swift() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/tempest b/lib/tempest
index 85e643e474..c1dc3a33ea 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -294,3 +294,7 @@ function init_tempest() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/template b/lib/template
index 02de5cef37..72904fe1c6 100644
--- a/lib/template
+++ b/lib/template
@@ -78,3 +78,7 @@ function stop_XXXX() {
 
 # Restore xtrace
 $XTRACE
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/lib/tls b/lib/tls
index 202edeffbf..fb8f4b9be6 100644
--- a/lib/tls
+++ b/lib/tls
@@ -316,3 +316,7 @@ function start_tls_proxy() {
 
     stud $STUD_PROTO -f $f_host,$f_port -b $b_host,$b_port $DEVSTACK_CERT 2>/dev/null
 }
+
+# Local variables:
+# mode: shell-script
+# End:
diff --git a/stackrc b/stackrc
index f35cdc07fb..5a4c580536 100644
--- a/stackrc
+++ b/stackrc
@@ -221,3 +221,7 @@ PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-"nova"}
 
 # Compatibility until it's eradicated from CI
 USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN}
+
+# Local variables:
+# mode: shell-script
+# End: