diff --git a/bash_completion b/bash_completion
index fcc6122a..58fc3906 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 #   bash_completion - programmable completion functions for bash 3.x
 #		      (backwards compatible with bash 2.05b)
 #
@@ -9283,9 +9286,3 @@ unset UNAME RELEASE default dirnames filenames have nospace bashdefault \
 
 set $BASH_COMPLETION_ORIGINAL_V_VALUE
 unset BASH_COMPLETION_ORIGINAL_V_VALUE
-
-###  Local Variables:
-###  mode: shell-script
-###  sh-basic-offset: 8
-###  indent-tabs-mode: t
-###  End:
diff --git a/contrib/_subversion b/contrib/_subversion
index 9cdd3668..88b7b57c 100644
--- a/contrib/_subversion
+++ b/contrib/_subversion
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # svn completion
 #
 have svn &&
diff --git a/contrib/apache2ctl b/contrib/apache2ctl
index 7f85fecd..07c6f2a2 100644
--- a/contrib/apache2ctl
+++ b/contrib/apache2ctl
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # apache2ctl(1) completion
 #
 have apache2ctl && {
diff --git a/contrib/bitkeeper b/contrib/bitkeeper
index 2a805a77..6536811e 100644
--- a/contrib/bitkeeper
+++ b/contrib/bitkeeper
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # BitKeeper completion adapted from code by  Bart Trojanowski <bart@jukie.net>
 #
 # $Id: bitkeeper,v 1.2 2002/06/12 22:03:23 ianmacd Exp $
@@ -18,4 +21,3 @@ _bk() {
 	return 0
 }
 complete -F _bk bk
-
diff --git a/contrib/bittorrent b/contrib/bittorrent
index 3821ce5b..6daa6389 100644
--- a/contrib/bittorrent
+++ b/contrib/bittorrent
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # btdownloadheadless(1) completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 #
 # $Id: bittorrent,v 1.1 2004/10/14 08:53:25 ianmacd Exp $
diff --git a/contrib/cksfv b/contrib/cksfv
index af6f2de3..db974c5e 100644
--- a/contrib/cksfv
+++ b/contrib/cksfv
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # cksfv completion by Chris <xris@forevermore.net>
 #
 # $Id: cksfv,v 1.3 2004/03/30 22:39:11 ianmacd Exp $
diff --git a/contrib/clisp b/contrib/clisp
index bc141f1d..36f0c006 100644
--- a/contrib/clisp
+++ b/contrib/clisp
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # bash brogrammable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 #
diff --git a/contrib/dsniff b/contrib/dsniff
index 4c464c9c..eb929869 100644
--- a/contrib/dsniff
+++ b/contrib/dsniff
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # dsniff util completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 #
 # $Id: dsniff,v 1.2 2003/12/31 08:22:37 ianmacd Exp $
diff --git a/contrib/freeciv b/contrib/freeciv
index 5f444ca0..1bd9217b 100644
--- a/contrib/freeciv
+++ b/contrib/freeciv
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # civserver completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 #
 # $Id: freeciv,v 1.2 2003/12/31 08:22:37 ianmacd Exp $
diff --git a/contrib/gcl b/contrib/gcl
index df317bf8..a6248fcf 100644
--- a/contrib/gcl
+++ b/contrib/gcl
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 #
diff --git a/contrib/gkrellm b/contrib/gkrellm
index 92cf66dd..cc6f5a47 100644
--- a/contrib/gkrellm
+++ b/contrib/gkrellm
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # gkrellm(1) completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 #
 # $Id: gkrellm,v 1.2 2003/12/31 08:22:37 ianmacd Exp $
diff --git a/contrib/gnatmake b/contrib/gnatmake
index 490cecff..7dfe85d6 100644
--- a/contrib/gnatmake
+++ b/contrib/gnatmake
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # Gnatmake completion by Ralf_Schroth@t-online.de (Ralf Schroth)
 #
 # $Id: gnatmake,v 1.1 2002/08/19 16:57:44 ianmacd Exp $
diff --git a/contrib/gpg2 b/contrib/gpg2
index eef592e1..02f5540f 100644
--- a/contrib/gpg2
+++ b/contrib/gpg2
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # gpg2(1) completion
 #
 have gpg2 && {
diff --git a/contrib/harbour b/contrib/harbour
index ccb0b839..255e9a20 100644
--- a/contrib/harbour
+++ b/contrib/harbour
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # harbour completion by Dave Pearson <davep@davep.org>
 # http://www.harbour-project.org/
 #
@@ -5,4 +8,3 @@
 
 complete -f -X '!*.@([Pp][Rr][Gg]|[Cc][Ll][Pp])' harbour gharbour hbpp
 complete -f -X '!*.[Hh][Rr][Bb]' hbrun
-
diff --git a/contrib/hg b/contrib/hg
index a5d9262c..60697094 100644
--- a/contrib/hg
+++ b/contrib/hg
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # Mercurial completion by Alexis S. L. Carvalho <alexis@cecm.usp.br>
 #
 # See: http://www.selenic.com/pipermail/mercurial/2005-August/003378.html
diff --git a/contrib/isql b/contrib/isql
index e9137cf7..f61a401a 100644
--- a/contrib/isql
+++ b/contrib/isql
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # isql completion by Victor Bogado da Silva Lins <victor@bogado.net>
 #
 # $Id: isql,v 1.2 2003/12/31 08:22:37 ianmacd Exp $
diff --git a/contrib/larch b/contrib/larch
index 34275920..afdbcc5f 100644
--- a/contrib/larch
+++ b/contrib/larch
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # larch(1) completion by Alex Shinn <foof@synthcode.com>
 #
 # $Id: larch,v 1.2 2003/12/31 08:22:37 ianmacd Exp $
diff --git a/contrib/lilypond b/contrib/lilypond
index 0e719040..59998e74 100644
--- a/contrib/lilypond
+++ b/contrib/lilypond
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # lilypond completion by Laurent Martelli <laurent@bearteam.org>
 #
 # $Id: lilypond,v 1.2 2003/12/31 08:22:37 ianmacd Exp $
diff --git a/contrib/lisp b/contrib/lisp
index a530e971..d8a27010 100644
--- a/contrib/lisp
+++ b/contrib/lisp
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 #
diff --git a/contrib/lzma b/contrib/lzma
index 1db97a7e..a18d2338 100644
--- a/contrib/lzma
+++ b/contrib/lzma
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # lzma(1) completion
 #
 have lzma &&
diff --git a/contrib/mailman b/contrib/mailman
index 375d1bf6..d6e05334 100644
--- a/contrib/mailman
+++ b/contrib/mailman
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # Mailman completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 #
 # $Id: mailman,v 1.1 2004/03/30 23:05:34 ianmacd Exp $
diff --git a/contrib/mcrypt b/contrib/mcrypt
index a6e4cf08..77d6f3f0 100644
--- a/contrib/mcrypt
+++ b/contrib/mcrypt
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # mcrypt(1) completion by Ariel Fermani <the_end@bbs.frc.utn.edu.ar>
 #
 # $Id: mcrypt,v 1.2 2003/12/31 08:22:37 ianmacd Exp $
diff --git a/contrib/modules b/contrib/modules
index 8240bff8..d21513ce 100644
--- a/contrib/modules
+++ b/contrib/modules
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # module completion by Ted Stern <stern@cray.com>
 #
 # $Id: modules,v 1.2 2005/07/11 17:49:14 ianmacd Exp $
@@ -81,7 +84,3 @@ _module () {
 }
 complete -o default -F _module module
 }
-# Local Variables:
-# mode:shell-script
-# sh-shell:bash
-# End:
diff --git a/contrib/monodevelop b/contrib/monodevelop
index 645f419d..d915d586 100644
--- a/contrib/monodevelop
+++ b/contrib/monodevelop
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # Monodevelop completion
 #
 have monodevelop &&
diff --git a/contrib/mtx b/contrib/mtx
index 6afdf0e0..80e02d46 100644
--- a/contrib/mtx
+++ b/contrib/mtx
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # mtx completion by Jon Middleton <jjm@ixtab.org.uk>
 #
 # $Id: mtx,v 1.1 2004/01/01 00:54:41 ianmacd Exp $
diff --git a/contrib/p4 b/contrib/p4
index 09347182..c4aa3575 100644
--- a/contrib/p4
+++ b/contrib/p4
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # Perforce completion by Frank Cusack <frank@google.com>
 #
 # $Id: p4,v 1.3 2003/12/31 08:22:37 ianmacd Exp $
diff --git a/contrib/povray b/contrib/povray
index 2598d1d8..a2336090 100644
--- a/contrib/povray
+++ b/contrib/povray
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # povray completion by "David Necas (Yeti)" <yeti@physics.muni.cz>
 #
 # $Id: povray,v 1.2 2003/12/31 08:22:37 ianmacd Exp $
diff --git a/contrib/qdbus b/contrib/qdbus
index e8b15e69..8a7681f7 100644
--- a/contrib/qdbus
+++ b/contrib/qdbus
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # Qt qdbus completion
 #
 have qdbus &&
diff --git a/contrib/ri b/contrib/ri
index d3b1115b..9eee1eb8 100644
--- a/contrib/ri
+++ b/contrib/ri
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # ri completion for Ruby documentation by Ian Macdonald <ian@caliban.org>
 #
 # $Id: ri,v 1.8 2006/02/25 14:25:59 ianmacd Exp $
diff --git a/contrib/sbcl b/contrib/sbcl
index 1b571b24..e6557066 100644
--- a/contrib/sbcl
+++ b/contrib/sbcl
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 #
diff --git a/contrib/sitecopy b/contrib/sitecopy
index 67746e43..fdf085e0 100644
--- a/contrib/sitecopy
+++ b/contrib/sitecopy
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # sitecopy(1) completion
 # Copyright 2003 Eelco Lempsink <eelcolempsink@gmx.net>
 # License: GNU GPL v2 or later
diff --git a/contrib/snownews b/contrib/snownews
index 602b6fb4..f040b1d0 100644
--- a/contrib/snownews
+++ b/contrib/snownews
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # snownews completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 #
 # $Id: snownews,v 1.2 2005/01/03 03:00:44 ianmacd Exp $
diff --git a/contrib/ssh b/contrib/ssh
index ab16fea2..4863b0eb 100644
--- a/contrib/ssh
+++ b/contrib/ssh
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # ssh(1) completion
 #
 have ssh && {
diff --git a/contrib/svk b/contrib/svk
index c68266b3..b0b0ead1 100644
--- a/contrib/svk
+++ b/contrib/svk
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # svk completion by Guillaume Rousse <guillomovitch@zarb.org>
 #
 # $Id: svk,v 1.1 2006/03/01 10:45:03 ianmacd Exp $
diff --git a/contrib/unace b/contrib/unace
index 6b90e572..12fc738e 100644
--- a/contrib/unace
+++ b/contrib/unace
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # unace(1) completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 #
 # $Id: unace,v 1.3 2003/12/31 08:22:37 ianmacd Exp $
diff --git a/contrib/unrar b/contrib/unrar
index b67216b3..5821eded 100644
--- a/contrib/unrar
+++ b/contrib/unrar
@@ -1,3 +1,6 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 et filetype=sh
+#
 # unrar(1) completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 #
 # $Id: unrar,v 1.4 2004/07/05 23:37:47 ianmacd Exp $