diff --git a/bash_completion b/bash_completion
index 4dbe5e8b..eb6d15ed 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1,5 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
 #
 #   bash_completion - programmable completion functions for bash 3.x
 #		      (backwards compatible with bash 2.05b)
@@ -1658,3 +1656,11 @@ unset UNAME USERLAND 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
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/_subversion b/contrib/_subversion
index 5489f8a3..7bd9a37f 100644
--- a/contrib/_subversion
+++ b/contrib/_subversion
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # svn completion
-#
+
 have svn &&
 {
 _svn()
@@ -424,3 +421,11 @@ _svnlook()
 }
 complete -F _svnlook $default svnlook
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/_yum b/contrib/_yum
index b61e1663..4abd0807 100644
--- a/contrib/_yum
+++ b/contrib/_yum
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # yum(8) completion
-#
+
 have yum && {
 _yum_list()
 {
@@ -178,3 +175,11 @@ _yum_arch()
 	return 0
 } &&
 complete -F _yum_arch $filenames yum-arch
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/ant b/contrib/ant
index 0cb504ab..591b663d 100644
--- a/contrib/ant
+++ b/contrib/ant
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for ant
 
 have ant && {
@@ -67,3 +64,11 @@ have complete-ant-cmd.pl && \
      complete -C complete-ant-cmd.pl -F _ant $filenames ant || \
      complete -F _ant $filenames ant
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/apache2ctl b/contrib/apache2ctl
index 1153b62f..5a81a39b 100644
--- a/contrib/apache2ctl
+++ b/contrib/apache2ctl
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # apache2ctl(1) completion
-#
+
 have apache2ctl && {
 _apache2ctl() {
 	local APWORDS
@@ -16,3 +13,11 @@ _apache2ctl() {
 }
 complete -F _apache2ctl apache2ctl
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/apt b/contrib/apt
index c902a0ad..935197df 100644
--- a/contrib/apt
+++ b/contrib/apt
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # Debian apt-get(8) completion.
-#
+
 have apt-get &&
 _apt_get()
 {
@@ -159,3 +156,11 @@ _apt_cache()
 	return 0
 } &&
 complete -F _apt_cache $filenames apt-cache
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/apt-build b/contrib/apt-build
index ca3f2b23..3866b676 100644
--- a/contrib/apt-build
+++ b/contrib/apt-build
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # Debian apt-build(1) completion.
-#
+
 have apt-build &&
 _apt_build()
 {
@@ -66,3 +63,11 @@ _apt_build()
 	return 0
 } &&
 complete -F _apt_build $filenames apt-build
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/aptitude b/contrib/aptitude
index 37191581..4dbb5acd 100644
--- a/contrib/aptitude
+++ b/contrib/aptitude
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # Debian aptitude(1) completion
-#
+
 have aptitude && {
 have grep-status && {
 _comp_dpkg_hold_packages()
@@ -95,3 +92,11 @@ _aptitude()
 }
 complete -F _aptitude $default aptitude
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/aspell b/contrib/aspell
index 5ddb1e7e..979370ea 100644
--- a/contrib/aspell
+++ b/contrib/aspell
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for aspell
 
 have aspell && {
@@ -91,3 +88,11 @@ _aspell()
 }
 complete -F _aspell $filenames aspell
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/autorpm b/contrib/autorpm
index c53acec5..7614bb70 100644
--- a/contrib/autorpm
+++ b/contrib/autorpm
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # autorpm(8) completion
-#
+
 have autorpm &&
 _autorpm()
 {
@@ -17,3 +14,11 @@ _autorpm()
 
 } &&
 complete -F _autorpm autorpm
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/bash-builtins b/contrib/bash-builtins
index cccf38e8..419da4f6 100644
--- a/contrib/bash-builtins
+++ b/contrib/bash-builtins
@@ -1,8 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
-# start of section containing completion functions for bash built-ins
-
 # bash alias completion
 #
 _alias()
@@ -129,3 +124,11 @@ _complete()
 	fi
 }
 complete -F _complete complete
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/bind-utils b/contrib/bind-utils
index 30874a61..d0a537e8 100644
--- a/contrib/bind-utils
+++ b/contrib/bind-utils
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for nslookup
 
 have nslookup &&
@@ -17,3 +14,11 @@ _nslookup()
 			       ignoretc' -- "$cur" ) )
 } &&
 complete -F _nslookup nslookup
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/bitkeeper b/contrib/bitkeeper
index 154a7ae5..a9e25e81 100644
--- a/contrib/bitkeeper
+++ b/contrib/bitkeeper
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # BitKeeper completion adapted from code by  Bart Trojanowski <bart@jukie.net>
 
 have bk &&
@@ -19,3 +16,11 @@ _bk() {
 	return 0
 } &&
 complete -F _bk bk
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/bittorrent b/contrib/bittorrent
index bc57f93b..ea27b3c0 100644
--- a/contrib/bittorrent
+++ b/contrib/bittorrent
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # btdownloadheadless(1) completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 have btdownloadheadless.py || have btdownloadcurses.py || \
@@ -38,3 +35,11 @@ _btdownload()
 	fi
 } &&
 complete -F _btdownload btdownloadheadless.py btdownloadcurses.py btdownloadgui.py
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/bluez-utils b/contrib/bluez-utils
index 3b665da9..770c0467 100644
--- a/contrib/bluez-utils
+++ b/contrib/bluez-utils
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for bluez-utils
 
 have hcitool && {
@@ -452,3 +449,11 @@ _avctrl()
 }
 complete -F _avctrl avctrl
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/brctl b/contrib/brctl
index 2d359bb2..c10e97b1 100644
--- a/contrib/brctl
+++ b/contrib/brctl
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for brctl
 
 have brctl &&
@@ -42,3 +39,11 @@ _brctl()
 	esac
 } &&
 complete -F _brctl $default brctl
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/bzip2 b/contrib/bzip2
index d0017b37..51fa9f1b 100644
--- a/contrib/bzip2
+++ b/contrib/bzip2
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for bzip2
 
 have bzip2 &&
@@ -40,3 +37,11 @@ _bzip2()
 		    $( compgen -d -- "$cur" ) )
 } &&
 complete -F _bzip2 $filenames bzip2
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/cardctl b/contrib/cardctl
index 689088d9..64e5c18c 100644
--- a/contrib/cardctl
+++ b/contrib/cardctl
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # Linux cardctl(8) completion
-#
+
 have cardctl &&
 _cardctl()
 {
@@ -18,3 +15,11 @@ _cardctl()
 	fi
 } &&
 complete -F _cardctl cardctl
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/cfengine b/contrib/cfengine
index 7b859ed0..5be498aa 100644
--- a/contrib/cfengine
+++ b/contrib/cfengine
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for cfengine
 
 have cfagent && {
@@ -87,3 +84,11 @@ _cfrun()
 }
 complete -F _cfrun cfrun
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/chkconfig b/contrib/chkconfig
index bb4711b8..578e43af 100644
--- a/contrib/chkconfig
+++ b/contrib/chkconfig
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # chkconfig(8) completion
-#
+
 have chkconfig &&
 _chkconfig()
 {
@@ -40,3 +37,11 @@ _chkconfig()
 	fi
 } &&
 complete -F _chkconfig chkconfig
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/chsh b/contrib/chsh
index b1c0eb8e..dc031318 100644
--- a/contrib/chsh
+++ b/contrib/chsh
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # chsh(1) completion
-#
+
 _chsh()
 {
 	local cur prev
@@ -20,3 +17,11 @@ _chsh()
 	return 0
 }
 complete -F _chsh chsh
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/cksfv b/contrib/cksfv
index 2b1d55f6..0e1e1469 100644
--- a/contrib/cksfv
+++ b/contrib/cksfv
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # cksfv completion by Chris <xris@forevermore.net>
 
 have cksfv &&
@@ -29,3 +26,11 @@ _cksfv()
 	return 0
 } &&
 complete -F _cksfv cksfv
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/clisp b/contrib/clisp
index 9ea40f43..57aeca91 100644
--- a/contrib/clisp
+++ b/contrib/clisp
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash brogrammable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
@@ -25,3 +22,11 @@ _clisp()
     return 0
 } &&
 complete -F _clisp $default clisp
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/configure b/contrib/configure
index c98603b7..a18b8c8c 100644
--- a/contrib/configure
+++ b/contrib/configure
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for configure
 
 _configure()
@@ -21,3 +18,11 @@ _configure()
 	fi
 }
 complete -F _configure $default configure
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/cowsay b/contrib/cowsay
index b63eadff..f66e5032 100644
--- a/contrib/cowsay
+++ b/contrib/cowsay
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for cowsay
 
 have cowsay &&
@@ -25,3 +22,11 @@ _cowsay()
 
 } &&
 complete -F _cowsay $default cowsay cowthink
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/cpan2dist b/contrib/cpan2dist
index d0281153..20c86ef1 100644
--- a/contrib/cpan2dist
+++ b/contrib/cpan2dist
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for cpan2dist
 
 have cpan2dist &&
@@ -43,3 +40,11 @@ _cpan2dist()
 	fi
 } &&
 complete -F _cpan2dist $default cpan2dist
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/cpio b/contrib/cpio
index 67c0ea3d..3ab18dac 100644
--- a/contrib/cpio
+++ b/contrib/cpio
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for cpio
 
 have cpio && {
@@ -94,3 +91,11 @@ _cpio()
 }
 complete -F _cpio cpio
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/cups b/contrib/cups
index 619a6025..50d3b24b 100644
--- a/contrib/cups
+++ b/contrib/cups
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for cups
 
 have cancel &&
@@ -14,3 +11,11 @@ _cancel()
 	COMPREPLY=( $( compgen -W "$( lpstat | cut -d' ' -f1 )" -- "$cur" ) )
 } &&
 complete -F _cancel $filenames cancel
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/cvs b/contrib/cvs
index 98b070b7..6f354cc7 100644
--- a/contrib/cvs
+++ b/contrib/cvs
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # cvs(1) completion
-#
+
 have cvs && {
 set_prefix()
 {
@@ -265,3 +262,11 @@ _cvs()
 }
 complete -F _cvs $default cvs
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/dcop b/contrib/dcop
index a3e568f4..f3ff7973 100644
--- a/contrib/dcop
+++ b/contrib/dcop
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for dcop
 
 have dcop &&
@@ -18,3 +15,11 @@ _dcop()
 	COMPREPLY=( $( compgen -W '$( command $compstr | sed s/\(.*\)// )'  -- "$cur" ) )
 } &&
 complete -F _dcop dcop
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/dd b/contrib/dd
index 93734571..71589ffa 100644
--- a/contrib/dd
+++ b/contrib/dd
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for dd
 
 have dd &&
@@ -33,3 +30,11 @@ _dd()
 				-S '=' -- "$cur" ) )
 } &&
 complete -F _dd $nospace $filenames dd
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/dhclient b/contrib/dhclient
index a33a05be..75a5570d 100644
--- a/contrib/dhclient
+++ b/contrib/dhclient
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for dhclient
 
 have dhclient && _dhclient()
@@ -30,3 +27,11 @@ have dhclient && _dhclient()
 	fi
 } &&
 complete -F _dhclient dhclient
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/dict b/contrib/dict
index 950a7d17..c9e36e63 100644
--- a/contrib/dict
+++ b/contrib/dict
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # dict(1) completion
-#
+
 { have dict || have rdict; } && {
 _dictdata()
 {
@@ -71,3 +68,11 @@ _dict()
 }
 complete -F _dict $default dict rdict
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/dpkg b/contrib/dpkg
index 6bca9e2e..01c39db8 100644
--- a/contrib/dpkg
+++ b/contrib/dpkg
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # This function is required by _dpkg() and _dpkg-reconfigure()
 have dpkg && {
 have grep-status && {
@@ -263,3 +260,11 @@ _dpkg_source()
 	esac
 } &&
 complete -F _dpkg_source dpkg-source
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/dselect b/contrib/dselect
index 13f89f7a..22b05c8e 100644
--- a/contrib/dselect
+++ b/contrib/dselect
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # Debian Linux dselect(8) completion.
-#
+
 have dselect &&
 _dselect()
 {
@@ -36,3 +33,11 @@ _dselect()
 	return 0
 } &&
 complete -F _dselect $filenames dselect
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/dsniff b/contrib/dsniff
index 30649dbe..c57f7bd1 100644
--- a/contrib/dsniff
+++ b/contrib/dsniff
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # dsniff util completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 # arpspoof(8) completion
@@ -281,3 +278,11 @@ _webmitm()
 
 } &&
 complete -F _webmitm webmitm
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/findutils b/contrib/findutils
index 09c0aa3a..726655d2 100644
--- a/contrib/findutils
+++ b/contrib/findutils
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for GNU find. This makes heavy use of ksh style extended
 # globs and contains Linux specific code for completing the parameter
 # to the -fstype option.
@@ -114,3 +111,11 @@ _find()
 	return 0
 } &&
 complete -F _find $filenames find
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/freeciv b/contrib/freeciv
index 3fe4b587..215cc480 100644
--- a/contrib/freeciv
+++ b/contrib/freeciv
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # civserver completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 have civserver &&
@@ -64,3 +61,11 @@ _civclient()
 
 } &&
 complete -F _civclient civclient
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/gcc b/contrib/gcc
index 889cf7dd..cc8a128f 100644
--- a/contrib/gcc
+++ b/contrib/gcc
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # gcc(1) completion
 #
 # The only unusual feature is that we don't parse "gcc --help -v" output
@@ -10,7 +7,7 @@
 # linker takes a -z option, but you must type -Wl,-z for gcc.)  Instead, we
 # ask the driver ("g++") for the name of the compiler ("cc1"), and parse the
 # --help output of the compiler.
-#
+
 have gcc &&
 _gcc()
 {
@@ -52,3 +49,11 @@ _gcc()
 complete $filenames -F _gcc gcc g++ c++ g77 gcj gpc
 [ $USERLAND = GNU -o $UNAME = Cygwin ] && \
 [ -n "${have:-}" ] && complete $filenames -F _gcc cc
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/gcl b/contrib/gcl
index 16c4eba8..8cb758f3 100644
--- a/contrib/gcl
+++ b/contrib/gcl
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
@@ -24,3 +21,11 @@ _gcl()
     return 0
 } &&
 complete -F _gcl $default gcl
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/gdb b/contrib/gdb
index d89f3c92..fb95200d 100644
--- a/contrib/gdb
+++ b/contrib/gdb
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for gdb
 
 have gdb &&
@@ -37,3 +34,11 @@ _gdb()
 	fi
 } &&
 complete -F _gdb $default gdb
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/genisoimage b/contrib/genisoimage
index 9ee06062..c0e3b48d 100644
--- a/contrib/genisoimage
+++ b/contrib/genisoimage
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for mkisofs/genisoimage
 
 (have mkisofs || have genisoimage) &&
@@ -72,3 +69,11 @@ _mkisofs()
 
 } &&
 complete -F _mkisofs $filenames mkisofs genisoimage
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/getent b/contrib/getent
index 1518ce45..01498661 100644
--- a/contrib/getent
+++ b/contrib/getent
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for getent
 
 have getent &&
@@ -50,3 +47,11 @@ _getent()
 	fi
 } &&
 complete -F _getent getent
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/gkrellm b/contrib/gkrellm
index 6eb30560..c5011828 100644
--- a/contrib/gkrellm
+++ b/contrib/gkrellm
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # gkrellm(1) completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 have gkrellm || have gkrellm2 &&
@@ -36,3 +33,11 @@ _gkrellm()
 
 } &&
 complete -F _gkrellm gkrellm gkrellm2
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/gnatmake b/contrib/gnatmake
index 2cfa6bb7..96644934 100644
--- a/contrib/gnatmake
+++ b/contrib/gnatmake
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # Gnatmake completion by Ralf_Schroth@t-online.de (Ralf Schroth)
 
 have gnatmake &&
@@ -31,3 +28,11 @@ _gnatmake()
 	fi
 } &&
 complete -F _gnatmake $filenames gnatmake
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/gpg b/contrib/gpg
index 95e1dead..ef7790a6 100644
--- a/contrib/gpg
+++ b/contrib/gpg
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for gpg
 
 have gpg &&
@@ -38,3 +35,11 @@ _gpg()
 
 } &&
 complete -F _gpg $default gpg
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/gpg2 b/contrib/gpg2
index 61fa3f24..f6d935a6 100644
--- a/contrib/gpg2
+++ b/contrib/gpg2
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # gpg2(1) completion
-#
+
 have gpg2 && {
 _gpg2 ()
 {
@@ -42,3 +39,11 @@ _gpg2 ()
 } &&
 complete -F _gpg2 $default gpg2
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/gzip b/contrib/gzip
index ada5de11..a3f964d0 100644
--- a/contrib/gzip
+++ b/contrib/gzip
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for gzip
 
 have gzip &&
@@ -42,3 +39,11 @@ _gzip()
 		    $( compgen -d -- "$cur" ) )
 } &&
 complete -F _gzip $filenames gzip
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/harbour b/contrib/harbour
index 0d111bd1..2dc1c9ef 100644
--- a/contrib/harbour
+++ b/contrib/harbour
@@ -1,8 +1,13 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # harbour completion by Dave Pearson <davep@davep.org>
 # http://www.harbour-project.org/
 
 complete -f -X '!*.@([Pp][Rr][Gg]|[Cc][Ll][Pp])' harbour gharbour hbpp
 complete -f -X '!*.[Hh][Rr][Bb]' hbrun
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/heimdal b/contrib/heimdal
index b39396fe..7401a90c 100644
--- a/contrib/heimdal
+++ b/contrib/heimdal
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for heimdal
 
 have ktutil && {
@@ -132,3 +129,11 @@ _ktutil()
 }
 complete -F _ktutil ktutil
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/iconv b/contrib/iconv
index ad250ac5..454d95c0 100644
--- a/contrib/iconv
+++ b/contrib/iconv
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # iconv(1) completion
-#
+
 have iconv &&
 _iconv()
 {
@@ -28,3 +25,11 @@ _iconv()
 	fi
 } &&
 complete -F _iconv $default iconv
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/imagemagick b/contrib/imagemagick
index ee1047e0..4604ebc9 100644
--- a/contrib/imagemagick
+++ b/contrib/imagemagick
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for ImageMagick
 
 have convert && {
@@ -536,3 +533,11 @@ _stream()
 }
 complete -F _stream $filenames stream
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/info b/contrib/info
index 432d6b7b..c90dafad 100644
--- a/contrib/info
+++ b/contrib/info
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for info
 
 have info &&
@@ -51,3 +48,11 @@ _info()
 	return 0
 } &&
 complete -F _info $filenames info
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/ipmitool b/contrib/ipmitool
index 074f34c9..177c2cb4 100644
--- a/contrib/ipmitool
+++ b/contrib/ipmitool
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for ipmitool
 
 have ipmitool &&
@@ -34,3 +31,11 @@ _ipmitool()
 
 } &&
 complete -F _ipmitool ipmitool
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/iptables b/contrib/iptables
index bb851393..0b8c59f3 100644
--- a/contrib/iptables
+++ b/contrib/iptables
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for iptables
 
 have iptables &&
@@ -63,3 +60,11 @@ _iptables()
 
 } &&
 complete -F _iptables iptables
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/isql b/contrib/isql
index 10f7d330..60b6868f 100644
--- a/contrib/isql
+++ b/contrib/isql
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # isql completion by Victor Bogado da Silva Lins <victor@bogado.net>
 
 have isql &&
@@ -12,3 +9,11 @@ _isql()
 	[ -f "$ODBCINI" ] && COMPREPLY=( $( grep \\["$cur" "$ODBCINI" | tr -d \\[\\] ) )
 } &&
 complete -F _isql isql
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/jar b/contrib/jar
index edbfe5bc..6aed1170 100644
--- a/contrib/jar
+++ b/contrib/jar
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # jar(1) completion
-#
+
 have jar &&
 _jar()
 {
@@ -29,3 +26,11 @@ _jar()
 	esac
 } &&
 complete -F _jar $filenames jar
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/java b/contrib/java
index fb8450a3..b2366f15 100644
--- a/contrib/java
+++ b/contrib/java
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for java, javac and javadoc
 
 # available path elements completion
@@ -254,3 +251,11 @@ _javac()
 	fi
 } &&
 complete -F _javac $filenames javac
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/kldload b/contrib/kldload
index c14d5984..2a791936 100644
--- a/contrib/kldload
+++ b/contrib/kldload
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for FreeBSD kernel module commands
 
 [ $UNAME = FreeBSD ] &&
@@ -31,3 +28,11 @@ _kldunload()
 complete -F _kldunload $filenames kldunload
 
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/larch b/contrib/larch
index 8ba72aed..c4289839 100644
--- a/contrib/larch
+++ b/contrib/larch
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # larch(1) completion by Alex Shinn <foof@synthcode.com>
 
 have larch &&
@@ -38,3 +35,11 @@ notify-library notify-browser push-new-revisions sendmail-mailx' "$cur" ))
 	return 0
 } &&
 complete -F _larch $default larch
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/ldapvi b/contrib/ldapvi
index de55c6f9..da9cd51f 100644
--- a/contrib/ldapvi
+++ b/contrib/ldapvi
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for ldapvi
 
 have ldapvi &&
@@ -68,3 +65,11 @@ _ldapvi()
 	fi
 } &&
 complete -F _ldapvi ldapvi
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/lftp b/contrib/lftp
index c8bd69c2..ef95fc27 100644
--- a/contrib/lftp
+++ b/contrib/lftp
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for lftp
 
 have lftp &&
@@ -19,3 +16,11 @@ _lftp()
 	return 0
 } &&
 complete -F _lftp $default lftp
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/lilo b/contrib/lilo
index aaa82b17..7921b68d 100644
--- a/contrib/lilo
+++ b/contrib/lilo
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for lilo(8)
 
 have lilo && {
@@ -55,3 +52,11 @@ _lilo()
 }
 complete -F _lilo lilo
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/lilypond b/contrib/lilypond
index 9c523efd..ae45de22 100644
--- a/contrib/lilypond
+++ b/contrib/lilypond
@@ -1,6 +1,11 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # lilypond completion by Laurent Martelli <laurent@bearteam.org>
 
 complete -f -X '!*.ly' lilypond ly2dvi
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/links b/contrib/links
index 51f3795e..e480a725 100644
--- a/contrib/links
+++ b/contrib/links
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for links
 
 have links &&
@@ -37,3 +34,11 @@ _links()
 	return 0
 } &&
 complete -F _links $filenames links
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/lisp b/contrib/lisp
index 95f29003..40f4171c 100644
--- a/contrib/lisp
+++ b/contrib/lisp
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
@@ -25,3 +22,11 @@ _lisp()
     return 0
 } &&
 complete -F _lisp $default lisp
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/lvm b/contrib/lvm
index 5e0b6101..a5368834 100644
--- a/contrib/lvm
+++ b/contrib/lvm
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for lvm
 
 have lvm && {
@@ -1126,3 +1123,11 @@ _lvm()
 }
 complete -F _lvm lvm
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/lzma b/contrib/lzma
index a366f0e0..2f05fa59 100644
--- a/contrib/lzma
+++ b/contrib/lzma
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # lzma(1) completion by Per Øyvind Karlsen <peroyvind@mandriva.org>
-#
+
 have lzma &&
 _lzma()
 {
@@ -40,3 +37,11 @@ _lzma()
 		$( compgen -d -- "$cur" ) )
 } &&
 complete -F _lzma $filenames lzma
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/lzop b/contrib/lzop
index a0e60069..980a3795 100644
--- a/contrib/lzop
+++ b/contrib/lzop
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # lzop(1) completion
 
 have lzop &&
@@ -51,3 +48,11 @@ _lzop()
 		    $( compgen -d -- "$cur" ) )
 } &&
 complete -F _lzop $filenames lzop
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/mailman b/contrib/mailman
index 9ada7eba..629bb02e 100644
--- a/contrib/mailman
+++ b/contrib/mailman
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # Mailman completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 have list_lists && {
@@ -595,3 +592,11 @@ _mailmanctl()
 
 } &&
 complete -F _mailmanctl mailmanctl
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/make b/contrib/make
index 14b07008..ded19f09 100644
--- a/contrib/make
+++ b/contrib/make
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for GNU make
 
 have make || have gmake || have gnumake || have pmake &&
@@ -72,3 +69,11 @@ _make()
 	fi
 } &&
 complete -F _make $filenames make gmake gnumake pmake
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/man b/contrib/man
index 06a773d4..37acb4a3 100644
--- a/contrib/man
+++ b/contrib/man
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # man(1) completion
-#
+
 [ $USERLAND = GNU -o $UNAME = Darwin \
   -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
   -o $UNAME = OpenBSD ] &&
@@ -76,3 +73,11 @@ _man()
   -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
   -o $UNAME = OpenBSD ] && \
 complete -F _man $filenames man apropos whatis
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/mc b/contrib/mc
index c9e57149..9edcd442 100644
--- a/contrib/mc
+++ b/contrib/mc
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for mc
 
 have mc &&
@@ -43,3 +40,11 @@ _mc()
 	fi
 } &&
 complete -F _mc $filenames mc
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/mcrypt b/contrib/mcrypt
index 2c5a60a3..f23d441c 100644
--- a/contrib/mcrypt
+++ b/contrib/mcrypt
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # mcrypt(1) completion by Ariel Fermani <the_end@bbs.frc.utn.edu.ar>
 
 have mcrypt || have mdecrypt &&
@@ -79,3 +76,11 @@ _mcrypt()
 	fi
 } &&
 complete $filenames -F _mcrypt mcrypt mdecrypt
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/mdadm b/contrib/mdadm
index 5fa18118..20316fb5 100644
--- a/contrib/mdadm
+++ b/contrib/mdadm
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for mdadm
 
 have mdadm && {
@@ -157,3 +154,11 @@ _mdadm()
 }
 complete -F _mdadm mdadm
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/minicom b/contrib/minicom
index 2e3f7d9f..3add87f0 100644
--- a/contrib/minicom
+++ b/contrib/minicom
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for minicom
 
 have minicom &&
@@ -44,3 +41,11 @@ _minicom()
 	fi
 } &&
 complete -F _minicom $default minicom
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/mkinitrd b/contrib/mkinitrd
index b72c71d8..771ceb6e 100644
--- a/contrib/mkinitrd
+++ b/contrib/mkinitrd
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for mkinitrd
 
 have mkinitrd &&
@@ -53,3 +50,11 @@ _mkinitrd()
 
 } &&
 complete -F _mkinitrd mkinitrd
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/mock b/contrib/mock
index dad43d22..af9eabc2 100644
--- a/contrib/mock
+++ b/contrib/mock
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for mock
 
 have mock &&
@@ -77,3 +74,11 @@ _mock()
 	fi
 } &&
 complete -F _mock $filenames mock
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/modules b/contrib/modules
index 58ad68c4..5bb286fe 100644
--- a/contrib/modules
+++ b/contrib/modules
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # module completion by Ted Stern <stern@cray.com>
 #
 # Completion for Environment Modules `module' alias.
@@ -84,3 +81,11 @@ _module () {
 }
 complete -F _module $default module
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/monodevelop b/contrib/monodevelop
index 94570d6c..46f4b4cb 100644
--- a/contrib/monodevelop
+++ b/contrib/monodevelop
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # Monodevelop completion
-#
+
 have monodevelop &&
 _monodevelop()
 {
@@ -95,3 +92,11 @@ _mdtool()
 	return 0
 } &&
 complete -F _mdtool $filenames mdtool
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/mplayer b/contrib/mplayer
index 65dbd730..c6bb8e88 100644
--- a/contrib/mplayer
+++ b/contrib/mplayer
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # mplayer(1) completion
 
 have mplayer && {
@@ -264,3 +261,11 @@ _mplayer()
 }
 complete $filenames -F _mplayer mplayer mencoder gmplayer kplayer
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/msynctool b/contrib/msynctool
index b5368625..a38fadf2 100644
--- a/contrib/msynctool
+++ b/contrib/msynctool
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for msynctool
 
 have msynctool &&
@@ -48,3 +45,11 @@ _msynctool()
 		--manual --configdir --conflict' -- "$cur" ) )
 } &&
 complete -F _msynctool msynctool
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/mtx b/contrib/mtx
index 39cc634e..84b55313 100644
--- a/contrib/mtx
+++ b/contrib/mtx
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # mtx completion by Jon Middleton <jjm@ixtab.org.uk>
 
 have mtx &&
@@ -45,3 +42,11 @@ _mtx()
     return 0
 } &&
 complete -F _mtx mtx
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/munin-node b/contrib/munin-node
index 746ed274..f709c631 100644
--- a/contrib/munin-node
+++ b/contrib/munin-node
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for munin node
 
 have munin-run &&
@@ -98,3 +95,11 @@ _munin-node-configure()
 	fi
 } &&
 complete -F _munin-node-configure munin-node-configure
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/mutt b/contrib/mutt
index dd0b8eac..fcecf19e 100644
--- a/contrib/mutt
+++ b/contrib/mutt
@@ -1,10 +1,8 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # mutt completion
 #
 # Mutt doesn't have an "addressbook" like Pine, but it has aliases and
 # a "query" function to retrieve addresses, so that's what we use here.
+
 have mutt || have muttng && {
 _muttaddr()
 {
@@ -139,3 +137,11 @@ _mutt()
 }
 complete -F _mutt $default $filenames mutt muttng
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/mysqladmin b/contrib/mysqladmin
index dc177a07..f6ae853c 100644
--- a/contrib/mysqladmin
+++ b/contrib/mysqladmin
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for mysqladmin
 
 have mysqladmin &&
@@ -33,3 +30,11 @@ _mysqladmin()
 		       -- "$cur" ) )
 } &&
 complete -F _mysqladmin mysqladmin
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/ncftp b/contrib/ncftp
index 441e0f69..0b5882bd 100644
--- a/contrib/ncftp
+++ b/contrib/ncftp
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for ncftp
 
 have ncftp &&
@@ -19,3 +16,11 @@ _ncftp()
 	return 0
 } &&
 complete -F _ncftp $default ncftp
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/net-tools b/contrib/net-tools
index 088a2087..90b15760 100644
--- a/contrib/net-tools
+++ b/contrib/net-tools
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for net tools
 
 have mii-tool &&
@@ -108,3 +105,11 @@ _route()
 	return 0
 }
 [ $UNAME = Linux ] && complete -F _route route
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/ntpdate b/contrib/ntpdate
index 5f8964f6..8edfd48c 100644
--- a/contrib/ntpdate
+++ b/contrib/ntpdate
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for ntpdate
 
 have ntpdate &&
@@ -31,3 +28,11 @@ _ntpdate()
 	fi
 } &&
 complete -F _ntpdate ntpdate
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/openldap b/contrib/openldap
index daf3b1c7..e7709c34 100644
--- a/contrib/openldap
+++ b/contrib/openldap
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for openldap
 
 have ldapsearch && {
@@ -270,3 +267,11 @@ _ldappasswd()
 }
 complete -F _ldappasswd ldappasswd
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/openssl b/contrib/openssl
index 9c924b85..e42d99fc 100644
--- a/contrib/openssl
+++ b/contrib/openssl
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for openssl
 
 have openssl && {
@@ -295,3 +292,11 @@ _openssl()
 }
 complete -F _openssl $default openssl
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/p4 b/contrib/p4
index 45e446a6..736944e1 100644
--- a/contrib/p4
+++ b/contrib/p4
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # Perforce completion by Frank Cusack <frank@google.com>
 
 have p4 &&
@@ -54,3 +51,11 @@ _p4()
 	return 0
 } &&
 complete -F _p4 $default p4 g4
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/perl b/contrib/perl
index e826201c..aa94ae02 100644
--- a/contrib/perl
+++ b/contrib/perl
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for perl
 
 have perl &&
@@ -117,3 +114,11 @@ _perldoc()
 }
 complete -F _perldoc $default perldoc
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/pine b/contrib/pine
index 05c029b3..e2a5dd38 100644
--- a/contrib/pine
+++ b/contrib/pine
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # PINE address-book completion
-#
+
 have pine &&
 _pineaddr()
 {
@@ -15,3 +12,11 @@ _pineaddr()
 			-- "$cur" ) )
 } &&
 complete -F _pineaddr $default pine
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/pkg-config b/contrib/pkg-config
index 23c5e303..bf57b476 100644
--- a/contrib/pkg-config
+++ b/contrib/pkg-config
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for pkgconfig
 
 have pkg-config &&
@@ -45,3 +42,11 @@ _pkg_config()
 	fi
 } &&
 complete -F _pkg_config pkg-config
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/pkg_install b/contrib/pkg_install
index eb8bb190..cd076e2a 100644
--- a/contrib/pkg_install
+++ b/contrib/pkg_install
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for FreeBSD base package management tools
 
 [ $UNAME = FreeBSD ] &&
@@ -24,3 +21,11 @@ _pkg_delete()
 complete -F _pkg_delete $dirnames pkg_delete pkg_info
 
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/pkgtools b/contrib/pkgtools
index dc92efb6..63f0f981 100644
--- a/contrib/pkgtools
+++ b/contrib/pkgtools
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for Slackware Linux pkgtools
 
 have removepkg && [ -f /etc/slackware-version ] &&
@@ -15,3 +12,11 @@ _removepkg()
 } &&
 complete -F _removepkg $filenames removepkg &&
 	complete $dirnames -f -X '!*.tgz' installpkg upgradepkg explodepkg
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/portupgrade b/contrib/portupgrade
index 8ee5cda3..8f7cac8b 100644
--- a/contrib/portupgrade
+++ b/contrib/portupgrade
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for FreeBSD portupgrade package
 
 have portupgrade &&
@@ -52,3 +49,11 @@ complete -F _portinstall $dirnames portinstall
 # _pkg_delete is in pkg_install
 type _pkg_delete &>/dev/null && have pkg_deinstall && \
 complete -F _pkg_delete $dirnames pkg_deinstall
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/postfix b/contrib/postfix
index 5bc9c42b..c8ebdbf4 100644
--- a/contrib/postfix
+++ b/contrib/postfix
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for postfix
 
 have postfix && {
@@ -229,3 +226,11 @@ _postsuper()
 }
 complete -F _postsuper $filenames postsuper
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/postgresql b/contrib/postgresql
index a86312ca..34b5e2ab 100644
--- a/contrib/postgresql
+++ b/contrib/postgresql
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for Postgresql
 
 have psql && {
@@ -165,3 +162,11 @@ _psql()
 }
 complete -F _psql $filenames psql
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/povray b/contrib/povray
index d189def2..ae73bcb6 100644
--- a/contrib/povray
+++ b/contrib/povray
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # povray completion by "David Necas (Yeti)" <yeti@physics.muni.cz>
 
 have povray || have xpovray || have spovray &&
@@ -58,3 +55,11 @@ _povray()
 	esac
 } &&
 complete -F _povray $filenames povray xpovray spovray
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/python b/contrib/python
index 97b4f8e3..fd03dcfe 100644
--- a/contrib/python
+++ b/contrib/python
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for python
 
 have python &&
@@ -51,3 +48,11 @@ _python()
 	return 0
 } &&
 complete -F _python $filenames python
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/qdbus b/contrib/qdbus
index 9f697b47..7a5d71cd 100644
--- a/contrib/qdbus
+++ b/contrib/qdbus
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # Qt qdbus completion
-#
+
 have qdbus &&
 _qdbus()
 {
@@ -18,3 +15,11 @@ _qdbus()
 	COMPREPLY=( $( compgen -W '$( command $compstr | sed s/\(.*\)// )' -- "$cur" ) )
 } &&
 complete -F _qdbus qdbus
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/qemu b/contrib/qemu
index 10509ced..e99fa5c0 100644
--- a/contrib/qemu
+++ b/contrib/qemu
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for qemu
 
 have qemu &&
@@ -124,3 +121,11 @@ _qemu()
 	fi
 } &&
 complete -F _qemu $filenames qemu
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/quota-tools b/contrib/quota-tools
index 86f79ec1..9e9f4c72 100644
--- a/contrib/quota-tools
+++ b/contrib/quota-tools
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for quota-tools
 
 have quota && {
@@ -257,3 +254,11 @@ _quotaoff()
 }
 complete -F _quotaoff $default quotaoff
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/rcs b/contrib/rcs
index 20d13dfb..da2db051 100644
--- a/contrib/rcs
+++ b/contrib/rcs
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for rcs
 
 have rcs &&
@@ -37,3 +34,11 @@ _rcs()
 	[ ${#COMPREPLY[@]} -eq 0 -a $1 = ci ] && _filedir || _filedir -d
 } &&
 complete -F _rcs $filenames ci co rlog rcs rcsdiff
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/rdesktop b/contrib/rdesktop
index 729ef013..9d0f8339 100644
--- a/contrib/rdesktop
+++ b/contrib/rdesktop
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for rdesktop
 
 have rdesktop &&
@@ -51,3 +48,11 @@ _rdesktop()
 
 } &&
 complete -F _rdesktop rdesktop
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/repomanage b/contrib/repomanage
index 566b389a..dd64d87a 100644
--- a/contrib/repomanage
+++ b/contrib/repomanage
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for repomanage
 
 have repomanage &&
@@ -22,3 +19,11 @@ _repomanage()
 	fi
 } &&
 complete -F _repomanage $filenames repomanage
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/reportbug b/contrib/reportbug
index e3d9ae05..a4e22f21 100644
--- a/contrib/reportbug
+++ b/contrib/reportbug
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for (Debian) reportbug package
 
 have reportbug &&
@@ -120,3 +117,11 @@ _querybts()
 	    		$( apt-cache pkgnames -- "$cur" 2> /dev/null) )
 } &&
 complete -F _querybts $filenames querybts
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/resolvconf b/contrib/resolvconf
index ea0b02fb..bbf59a60 100644
--- a/contrib/resolvconf
+++ b/contrib/resolvconf
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for resolvconf
 
 have resolvconf &&
@@ -24,3 +21,11 @@ _resolvconf()
 	fi
 } &&
 complete -F _resolvconf resolvconf
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/rfkill b/contrib/rfkill
index ca802fa7..b15c8dec 100644
--- a/contrib/rfkill
+++ b/contrib/rfkill
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for rfkill
 
 have rfkill &&
@@ -34,3 +31,10 @@ _rfkill()
 } &&
 complete -F _rfkill rfkill
 
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/ri b/contrib/ri
index 8a3599de..08461ded 100644
--- a/contrib/ri
+++ b/contrib/ri
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # ri completion for Ruby documentation by Ian Macdonald <ian@caliban.org>
 
 have ri && {
@@ -89,3 +86,11 @@ _ri()
 }
 complete -F _ri ri
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/rpcdebug b/contrib/rpcdebug
index 4fb1f874..9ed76772 100644
--- a/contrib/rpcdebug
+++ b/contrib/rpcdebug
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for rpcdebug
 
 have rpcdebug && {
@@ -51,3 +48,11 @@ _rpcdebug()
 }
 complete -F _rpcdebug rpcdebug
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/rpm b/contrib/rpm
index 03a52f83..0f7f66e1 100644
--- a/contrib/rpm
+++ b/contrib/rpm
@@ -1,9 +1,8 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
+# bash completion for rpm
 
 have rpm && {
-# helper functions for rpm completion
-#
+# helper functions
+
 _rpm_installed_packages()
 {
 	local nodig="$1" nosig="$2"
@@ -294,3 +293,11 @@ _rpm()
 }
 complete -F _rpm $filenames rpm rpmbuild
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/rpmcheck b/contrib/rpmcheck
index 1cf69db1..0de67634 100644
--- a/contrib/rpmcheck
+++ b/contrib/rpmcheck
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for rpmcheck
 
 have rpmcheck &&
@@ -28,3 +25,11 @@ _rpmcheck()
 	fi
 } &&
 complete -F _rpmcheck rpmcheck $files
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/rrdtool b/contrib/rrdtool
index 693dde95..b24a6452 100644
--- a/contrib/rrdtool
+++ b/contrib/rrdtool
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for rrdtool
 
 have rrdtool &&
@@ -12,3 +9,11 @@ _rrdtool ()
 	                           fetch tune resize xport' -- "$cur" ) )
 } &&
 complete -F _rrdtool rrdtool
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/rsync b/contrib/rsync
index a7349c54..4a6507dc 100644
--- a/contrib/rsync
+++ b/contrib/rsync
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for rsync
 
 have rsync &&
@@ -95,3 +92,11 @@ _rsync()
 	return 0
 } &&
 complete -F _rsync $nospace $filenames rsync
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/samba b/contrib/samba
index f3529e54..8463f0f2 100644
--- a/contrib/samba
+++ b/contrib/samba
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for samba
 
 have smbclient && {
@@ -301,3 +298,11 @@ _smbtree()
 }
 complete -F _smbtree smbtree
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/sbcl b/contrib/sbcl
index 2996a227..cd3ff4e8 100644
--- a/contrib/sbcl
+++ b/contrib/sbcl
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash programmable completion for various Common Lisp implementations by
 # Nikodemus Siivola <nikodemus@random-state.net>
 
@@ -24,3 +21,11 @@ _sbcl()
     return 0
 } &&
 complete -F _sbcl $filenames sbcl sbcl-mt
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/screen b/contrib/screen
index bce19efa..4397b3fa 100644
--- a/contrib/screen
+++ b/contrib/screen
@@ -1,10 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for screen
 
-# screen(1) completion
-#
 have screen &&
 _screen_sessions()
 {
@@ -64,3 +59,11 @@ _screen()
 	fi
 } &&
 complete -F _screen $default screen
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/shadow b/contrib/shadow
index 0c150a33..a09e913c 100644
--- a/contrib/shadow
+++ b/contrib/shadow
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for shadow utils
 
 have useradd &&
@@ -494,3 +491,11 @@ _lastlog()
 	fi
 } &&
 complete -F _lastlog lastlog
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/sitecopy b/contrib/sitecopy
index e4dd6864..f53cf1aa 100644
--- a/contrib/sitecopy
+++ b/contrib/sitecopy
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # sitecopy(1) completion
 # Copyright 2003 Eelco Lempsink <eelcolempsink@gmx.net>
 # License: GNU GPL v2 or later
@@ -30,3 +27,11 @@ _sitecopy()
 	return 0
 } &&
 complete -F _sitecopy $default sitecopy
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/smartctl b/contrib/smartctl
index d401f81d..ba26e878 100644
--- a/contrib/smartctl
+++ b/contrib/smartctl
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for smartctl(8)
 
 have smartctl && {
@@ -142,3 +139,11 @@ _smartctl()
 }
 complete -F _smartctl smartctl
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/snownews b/contrib/snownews
index 47ab0e33..d57b2f37 100644
--- a/contrib/snownews
+++ b/contrib/snownews
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # snownews completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 have snownews &&
@@ -18,3 +15,11 @@ _snownews()
 	fi
 } &&
 complete -F _snownews snownews
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/ssh b/contrib/ssh
index 8c6b336d..2070c23e 100644
--- a/contrib/ssh
+++ b/contrib/ssh
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # ssh(1) completion
-#
+
 have ssh && {
 
 _ssh_options() {
@@ -253,3 +250,11 @@ _ssh_copy_id() {
 }
 complete -F _ssh_copy_id $filenames ssh-copy-id
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/strace b/contrib/strace
index d96f4eaf..0c46ca85 100644
--- a/contrib/strace
+++ b/contrib/strace
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for strace
 
 have strace &&
@@ -97,3 +94,11 @@ _strace()
 	fi
 } &&
 complete -F _strace $default strace
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/svk b/contrib/svk
index d25f5d53..e3716332 100644
--- a/contrib/svk
+++ b/contrib/svk
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # svk completion by Guillaume Rousse <guillomovitch@zarb.org>
 
 have svk &&
@@ -262,3 +259,11 @@ _svk()
 	return 0
 } &&
 complete -F _svk $filenames svk
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/sysctl b/contrib/sysctl
index 7860f427..1a61feb7 100644
--- a/contrib/sysctl
+++ b/contrib/sysctl
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for sysctl
 
 have sysctl &&
@@ -16,3 +13,11 @@ _sysctl()
 	return 0
 } &&
 complete -F _sysctl sysctl
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/sysv-rc b/contrib/sysv-rc
index 8e194e95..e6c9d316 100644
--- a/contrib/sysv-rc
+++ b/contrib/sysv-rc
@@ -1,10 +1,7 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # update-rc.d(8) completion
 #
 # Copyright (C) 2004 Servilio Afre Puentes <servilio@gmail.com>
-#
+
 have update-rc.d &&
 _update_rc_d()
 {
@@ -107,3 +104,11 @@ _invoke_rc_d()
     return 0
 } &&
 complete -F _invoke_rc_d invoke-rc.d
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/tar b/contrib/tar
index 90885ead..983e8028 100644
--- a/contrib/tar
+++ b/contrib/tar
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for GNU tar
 
 have tar && {
@@ -66,3 +63,11 @@ _tar()
 [ -n "${COMP_TAR_INTERNAL_PATHS:-}" ] && complete -F _tar $dirnames tar ||
 	complete -F _tar $filenames tar
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/tcpdump b/contrib/tcpdump
index 3f72d7b7..194cf346 100644
--- a/contrib/tcpdump
+++ b/contrib/tcpdump
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for tcpdump
 
 have tcpdump &&
@@ -32,3 +29,11 @@ _tcpdump()
 
 } &&
 complete -F _tcpdump tcpdump
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/unace b/contrib/unace
index aaca67c6..fdb0986c 100644
--- a/contrib/unace
+++ b/contrib/unace
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # unace(1) completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 have unace &&
@@ -28,3 +25,11 @@ _unace()
 
 } &&
 complete -F _unace $filenames unace
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/unrar b/contrib/unrar
index aa2bbaa0..c5c1fd62 100644
--- a/contrib/unrar
+++ b/contrib/unrar
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # unrar(1) completion by Guillaume Rousse <rousse@ccr.jussieu.fr>
 
 have unrar &&
@@ -29,3 +26,11 @@ _unrar()
 	return 0
 } &&
 complete -F _unrar $filenames unrar
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/update-alternatives b/contrib/update-alternatives
index f3b33466..fdefc4a8 100644
--- a/contrib/update-alternatives
+++ b/contrib/update-alternatives
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for update-alternatives
 
 have update-alternatives && {
@@ -92,3 +89,11 @@ _update_alternatives()
 }
 complete -F _update_alternatives update-alternatives alternatives
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/vncviewer b/contrib/vncviewer
index 48985182..31bdb228 100644
--- a/contrib/vncviewer
+++ b/contrib/vncviewer
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for vncviewer
 
 have vncviewer &&
@@ -125,3 +122,11 @@ _xvnc4viewer()
 	fi
 } &&
 complete -F _xvnc4viewer xvnc4viewer
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/vpnc b/contrib/vpnc
index 9e5e9a48..0c448777 100644
--- a/contrib/vpnc
+++ b/contrib/vpnc
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for vpnc
 
 have vpnc &&
@@ -44,3 +41,11 @@ _vpnc()
 	fi
 } &&
 complete -F _vpnc vpnc
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/wireless-tools b/contrib/wireless-tools
index 58c1ebd9..5b4888a1 100644
--- a/contrib/wireless-tools
+++ b/contrib/wireless-tools
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for Linux wireless-tools
 
 [ $UNAME = Linux ] &&
@@ -183,3 +180,11 @@ _iwpriv()
 complete -F _iwpriv iwpriv
 
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/wodim b/contrib/wodim
index 8d103960..6924812b 100644
--- a/contrib/wodim
+++ b/contrib/wodim
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for cdrecord/wodim
 
 have cdrecord || have wodim &&
@@ -77,3 +74,11 @@ _cdrecord()
 
 } &&
 complete -F _cdrecord $filenames cdrecord wodim
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/wvdial b/contrib/wvdial
index 3c1fec3a..694cd27a 100644
--- a/contrib/wvdial
+++ b/contrib/wvdial
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for wvdial
 
 have wvdial &&
@@ -47,3 +44,11 @@ _wvdial()
 
 } &&
 complete -F _wvdial wvdial
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/xhost b/contrib/xhost
index 02c7ba1d..06f19b93 100644
--- a/contrib/xhost
+++ b/contrib/xhost
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # xhost(1) completion
-#
+
 have xhost &&
 _xhost ()
 {
@@ -17,3 +14,11 @@ _xhost ()
 	return 0
 }
 complete -F _xhost xhost
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/xm b/contrib/xm
index a70c21e4..e7f06c38 100644
--- a/contrib/xm
+++ b/contrib/xm
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for xm
 
 have xm && {
@@ -218,3 +215,11 @@ _xm()
 }
 complete -F _xm xm
 }
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/xmllint b/contrib/xmllint
index 30953564..973352c7 100644
--- a/contrib/xmllint
+++ b/contrib/xmllint
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for xmllint(1)
 
 have xmllint &&
@@ -49,3 +46,11 @@ _xmllint()
 	_filedir '@(*ml|htm|svg)'
 } &&
 complete -F _xmllint $filenames xmllint
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/xmlwf b/contrib/xmlwf
index b6ac40a0..f31d7c93 100644
--- a/contrib/xmlwf
+++ b/contrib/xmlwf
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for xmlwf(1)
 
 have xmlwf &&
@@ -33,3 +30,11 @@ _xmlwf()
 	_filedir '@(*ml|htm|svg)'
 } &&
 complete -F _xmlwf $filenames xmlwf
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/xmms b/contrib/xmms
index c70b581b..79607932 100644
--- a/contrib/xmms
+++ b/contrib/xmms
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for xmms
 
 have xmms &&
@@ -23,3 +20,11 @@ _xmms()
 
 } &&
 complete -F _xmms $filenames xmms
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/xrandr b/contrib/xrandr
index 140e5e98..ad48898e 100644
--- a/contrib/xrandr
+++ b/contrib/xrandr
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for xrandr
 
 have xrandr &&
@@ -49,3 +46,11 @@ _xrandr()
 	return 0
 } &&
 complete -F _xrandr xrandr
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/xz b/contrib/xz
index 118ef7a1..6067d697 100644
--- a/contrib/xz
+++ b/contrib/xz
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # xz(1) completion
-#
+
 have xz &&
 _xz()
 {
@@ -97,3 +94,11 @@ _xzdec()
 	_filedir xz # no lzma support here as of xz 4.999.8beta
 } &&
 complete -F _xzdec $filenames xzdec
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/yp-tools b/contrib/yp-tools
index 878cfe9c..9f2d7a71 100644
--- a/contrib/yp-tools
+++ b/contrib/yp-tools
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bash completion for yp-tools
 
 have ypmatch &&
@@ -28,3 +25,11 @@ _ypmatch()
 	return 0
 } &&
 complete -F _ypmatch ypmatch ypcat
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/contrib/yum-arch b/contrib/yum-arch
index 97bc4109..0efd492a 100644
--- a/contrib/yum-arch
+++ b/contrib/yum-arch
@@ -1,8 +1,5 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-
 # yum-arch(8) completion
-#
+
 have yum-arch &&
 _yum_arch()
 {
@@ -23,3 +20,11 @@ _yum_arch()
 	return 0
 } &&
 complete -F _yum_arch $filenames yum-arch
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/test/config/bashrc b/test/config/bashrc
index 85399773..bc0dd8db 100644
--- a/test/config/bashrc
+++ b/test/config/bashrc
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # bashrc file for DejaGnu testsuite
 
 	# Use emacs key bindings
@@ -29,3 +26,11 @@ unset -v \
 
 	# Load bash testsuite helper functions
 . lib/library.sh
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/test/config/inputrc b/test/config/inputrc
index 18e5a581..efd15319 100644
--- a/test/config/inputrc
+++ b/test/config/inputrc
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # Readline init file for DejaGnu testsuite
 # See: info readline
 
@@ -14,3 +11,11 @@ set completion-query-items -1
 set print-completions-horizontally on
 	# Don't use pager when showing completions
 set page-completions off
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh
diff --git a/test/lib/library.sh b/test/lib/library.sh
index a2973a06..1efee49d 100644
--- a/test/lib/library.sh
+++ b/test/lib/library.sh
@@ -1,6 +1,3 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
-# ex: ts=8 sw=8 noet filetype=sh
-#
 # Bash library for bash-completion DejaGnu testsuite
 
 
@@ -45,3 +42,10 @@ is_bash_version_minimal() {
 	]]
 } # is_bash_version_minimal()
 
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 8
+# sh-indent-comment: t
+# indent-tabs-mode: t
+# End:
+# ex: ts=8 sw=8 noet filetype=sh