diff --git a/auto b/auto
index a979c3c..fb18a3c 100755
--- a/auto
+++ b/auto
@@ -50,4 +50,4 @@ else
     echo "Usage: auto (start|stop|rehash|status|getmodules)"
 fi
 
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/bin/auto b/bin/auto
index 10a5ee2..ab79b2a 100755
--- a/bin/auto
+++ b/bin/auto
@@ -547,4 +547,4 @@ sub mod_load {
     return;
 }
 
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/bin/buildmod b/bin/buildmod
index 71ea4c9..9b2c0e1 100755
--- a/bin/buildmod
+++ b/bin/buildmod
@@ -150,4 +150,4 @@ $manifier->parse_from_file("$Bin/../autodoc/$module.pod", "$Bin/../autodoc/$modu
 print $RS;
 say 'Done.';
 
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/bin/critic b/bin/critic
index ab7c3c8..db9ffcf 100755
--- a/bin/critic
+++ b/bin/critic
@@ -58,4 +58,4 @@ foreach (@violations) {
 }
 say "$count violations in $ARGV[0].";
 
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/bin/genssl b/bin/genssl
index f2724df..0f1ad0c 100755
--- a/bin/genssl
+++ b/bin/genssl
@@ -44,4 +44,4 @@ while ($fpr =~ s/(.*\n)//) {
 # Print the fingerprint.
 say 'Done. Fingerprint: '.$fp;
 
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/install b/install
index aca3db9..ebb0bf0 100755
--- a/install
+++ b/install
@@ -149,4 +149,4 @@ println q{};
 # Success!
 println "Done. Auto successfully installed.";
 
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/lib/API/IRC.pm b/lib/API/IRC.pm
index 3710e8a..0ecb37b 100644
--- a/lib/API/IRC.pm
+++ b/lib/API/IRC.pm
@@ -219,4 +219,4 @@ sub match_mask
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/lib/API/Log.pm b/lib/API/Log.pm
index 86c04ea..f7a4fbd 100644
--- a/lib/API/Log.pm
+++ b/lib/API/Log.pm
@@ -143,4 +143,4 @@ sub slog
 }
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/lib/API/Std.pm b/lib/API/Std.pm
index 2be744a..876ce6d 100644
--- a/lib/API/Std.pm
+++ b/lib/API/Std.pm
@@ -518,4 +518,4 @@ sub awarn
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/lib/Core/Cmd.pm b/lib/Core/Cmd.pm
index 3a16eb6..bc20524 100644
--- a/lib/Core/Cmd.pm
+++ b/lib/Core/Cmd.pm
@@ -314,4 +314,4 @@ sub cmd_help
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/lib/Core/IRC.pm b/lib/Core/IRC.pm
index 9e5bd90..57d9443 100644
--- a/lib/Core/IRC.pm
+++ b/lib/Core/IRC.pm
@@ -133,4 +133,4 @@ sub clear_usercmd_timer
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/lib/Lib/Auto.pm b/lib/Lib/Auto.pm
index e4d9cf1..c2c5b2c 100644
--- a/lib/Lib/Auto.pm
+++ b/lib/Lib/Auto.pm
@@ -283,4 +283,4 @@ sub signal_perldie
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/lib/Lib/Install.pm b/lib/Lib/Install.pm
index 83e2169..07555ec 100644
--- a/lib/Lib/Install.pm
+++ b/lib/Lib/Install.pm
@@ -131,4 +131,4 @@ sub installmods
 }
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/lib/Parser/Config.pm b/lib/Parser/Config.pm
index 09938ce..691b3bb 100644
--- a/lib/Parser/Config.pm
+++ b/lib/Parser/Config.pm
@@ -177,4 +177,4 @@ sub parse
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/lib/Parser/Lang.pm b/lib/Parser/Lang.pm
index 0494df0..ebf83cf 100644
--- a/lib/Parser/Lang.pm
+++ b/lib/Parser/Lang.pm
@@ -64,4 +64,4 @@ sub parse
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/lib/Proto/IRC.pm b/lib/Proto/IRC.pm
index 5c5ce10..bd81c07 100644
--- a/lib/Proto/IRC.pm
+++ b/lib/Proto/IRC.pm
@@ -703,4 +703,4 @@ sub topic
 
 
 1;
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
diff --git a/modules/Badwords.pm b/modules/Badwords.pm
index 1757679..8c19ba7 100644
--- a/modules/Badwords.pm
+++ b/modules/Badwords.pm
@@ -71,7 +71,7 @@ sub actonbadword
 
 
 API::Std::mod_init('Badwords', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
diff --git a/modules/Bitly.pm b/modules/Bitly.pm
index 1dfc4b6..40d533b 100644
--- a/modules/Bitly.pm
+++ b/modules/Bitly.pm
@@ -119,7 +119,7 @@ sub reverse
 
 # Start initialization.
 API::Std::mod_init('Bitly', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=LWP::UserAgent,URI::Escape perl=5.010000
 
 __END__
diff --git a/modules/Calc.pm b/modules/Calc.pm
index 19916a7..4de5991 100644
--- a/modules/Calc.pm
+++ b/modules/Calc.pm
@@ -79,7 +79,7 @@ sub calc
 
 # Start initialization.
 API::Std::mod_init('Calc', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=LWP::UserAgent,URI::Escape,JSON,JSON::PP perl=5.010000
 
 __END__
diff --git a/modules/ChanTopics.pm b/modules/ChanTopics.pm
index 8561da3..ab5bd06 100644
--- a/modules/ChanTopics.pm
+++ b/modules/ChanTopics.pm
@@ -283,7 +283,7 @@ sub _getdata
 
 
 API::Std::mod_init('ChanTopics', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
diff --git a/modules/Dictionary.pm b/modules/Dictionary.pm
index 4f960f2..0d64e45 100644
--- a/modules/Dictionary.pm
+++ b/modules/Dictionary.pm
@@ -76,7 +76,7 @@ sub cmd_dict
 
 # Start initialization.
 API::Std::mod_init('Dictionary', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=Net::Dict perl=5.010000
 
 __END__
diff --git a/modules/EightBall.pm b/modules/EightBall.pm
index a045307..d7fabb1 100644
--- a/modules/EightBall.pm
+++ b/modules/EightBall.pm
@@ -100,7 +100,7 @@ sub rigball
 
 # Start initialization.
 API::Std::mod_init('EightBall', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
diff --git a/modules/Eval.pm b/modules/Eval.pm
index fcd634c..951bdb0 100644
--- a/modules/Eval.pm
+++ b/modules/Eval.pm
@@ -64,7 +64,7 @@ sub cmd_eval {
 
 # Start initialization.
 API::Std::mod_init('Eval', 'Xelhua', '1.01', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
diff --git a/modules/FML.pm b/modules/FML.pm
index 260f817..3809085 100644
--- a/modules/FML.pm
+++ b/modules/FML.pm
@@ -68,7 +68,7 @@ sub fml
 
 # Start initialization.
 API::Std::mod_init('FML', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=LWP::UserAgent perl=5.010000
 
 __END__
diff --git a/modules/Greet.pm b/modules/Greet.pm
index ba9445a..cedee37 100644
--- a/modules/Greet.pm
+++ b/modules/Greet.pm
@@ -126,7 +126,7 @@ sub hook_rcjoin
 
 # Start initialization.
 API::Std::mod_init('Greet', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
diff --git a/modules/HelloChan.pm b/modules/HelloChan.pm
index 1bd887d..cf967d6 100644
--- a/modules/HelloChan.pm
+++ b/modules/HelloChan.pm
@@ -37,7 +37,7 @@ sub hello
 
 # Start initialization.
 API::Std::mod_init('HelloChan', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
diff --git a/modules/IsItUp.pm b/modules/IsItUp.pm
index 904b9ba..e2cbf06 100644
--- a/modules/IsItUp.pm
+++ b/modules/IsItUp.pm
@@ -70,7 +70,7 @@ sub check
 
 # Start initialization.
 API::Std::mod_init('IsItUp', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=LWP::UserAgent perl=5.010000
 
 __END__
diff --git a/modules/LinkTitle.pm b/modules/LinkTitle.pm
index 513446e..e60ebc7 100644
--- a/modules/LinkTitle.pm
+++ b/modules/LinkTitle.pm
@@ -67,7 +67,7 @@ sub gettitle
 
 # Start initialization.
 API::Std::mod_init('LinkTitle', 'Xelhua', '1.00', '3.0.0a5', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=LWP::UserAgent,HTML::Entities perl=5.010000
 
 __END__
diff --git a/modules/QDB.pm b/modules/QDB.pm
index 5d210cc..f9b80dd 100644
--- a/modules/QDB.pm
+++ b/modules/QDB.pm
@@ -212,7 +212,7 @@ sub cmd_qdb
 
 
 API::Std::mod_init('QDB', 'Xelhua', '1.02', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
diff --git a/modules/SASLAuth.pm b/modules/SASLAuth.pm
index 972ec5f..6b8e464 100644
--- a/modules/SASLAuth.pm
+++ b/modules/SASLAuth.pm
@@ -131,7 +131,7 @@ sub handle_906
 
 # Start initialization.
 API::Std::mod_init('SASLAuth', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
diff --git a/modules/UNO.pm b/modules/UNO.pm
index b9e59f9..bfe1a18 100644
--- a/modules/UNO.pm
+++ b/modules/UNO.pm
@@ -1311,7 +1311,7 @@ sub on_rehash {
 
 # Start initialization.
 API::Std::mod_init('UNO', 'Xelhua', '1.02', '3.0.0a6', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: perl=5.010000
 
 __END__
diff --git a/modules/Weather.pm b/modules/Weather.pm
index 7556f7e..0ddbc34 100644
--- a/modules/Weather.pm
+++ b/modules/Weather.pm
@@ -79,7 +79,7 @@ sub weather
 
 # Start initialization.
 API::Std::mod_init('Weather', 'Xelhua', '1.00', '3.0.0a4', __PACKAGE__);
-# vim: set ai sw=4 ts=4:
+# vim: set ai et sw=4 ts=4:
 # build: cpan=LWP::UserAgent,XML::Simple perl=5.010000
 
 __END__