diff --git a/scripts/supybot b/scripts/supybot
index 5ddd3668a..b3e03edc3 100644
--- a/scripts/supybot
+++ b/scripts/supybot
@@ -329,7 +329,6 @@ if __name__ == '__main__':
     import supybot.plugins.Owner as Owner
 
     owner = Owner.Class()
-    #irclib._callbacks.append(owner)
 
     if options.profile:
         import profile
@@ -339,4 +338,4 @@ if __name__ == '__main__':
         main()
 
 
-# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
+# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
diff --git a/scripts/supybot-adduser b/scripts/supybot-adduser
index 5f5483bde..7a0162c0c 100644
--- a/scripts/supybot-adduser
+++ b/scripts/supybot-adduser
@@ -99,7 +99,7 @@ def main():
         password = getpass('What is %s\'s password? ' % name)
     else:
         password = options.password
-    
+
     if not options.capabilities:
         capabilities = []
         prompt = 'Would you like to give %s a capability?' % name
@@ -125,3 +125,5 @@ if __name__ == '__main__':
         main()
     except KeyboardInterrupt:
         pass
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
diff --git a/scripts/supybot-botchk b/scripts/supybot-botchk
index faeb1bd12..bd9730fdf 100644
--- a/scripts/supybot-botchk
+++ b/scripts/supybot-botchk
@@ -129,5 +129,5 @@ if __name__ == '__main__':
         sys.exit(ret)
     else:
         sys.exit(0)
-        
-# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
diff --git a/scripts/supybot-plugin-create b/scripts/supybot-plugin-create
index 9f18ac57f..fd6f88364 100644
--- a/scripts/supybot-plugin-create
+++ b/scripts/supybot-plugin-create
@@ -105,7 +105,7 @@ class %s(callbacks.Plugin):
 Class = %s
 
 
-# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
+# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
 '''.lstrip() # This removes the newlines that precede and follow the text.
 
 configTemplate = '''
@@ -282,4 +282,4 @@ if __name__ == '__main__':
         finished.  Obviously, nothing was written, but just run this script
         again whenever you want to generate a template for a plugin.""")
 
-# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
+# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
diff --git a/scripts/supybot-plugin-doc b/scripts/supybot-plugin-doc
index 3ebb4194d..22d01de55 100644
--- a/scripts/supybot-plugin-doc
+++ b/scripts/supybot-plugin-doc
@@ -241,4 +241,4 @@ if __name__ == '__main__':
         shutil.rmtree(conf.supybot.directories.conf())
         shutil.rmtree(conf.supybot.directories.data())
 
-# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=78:
+# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=78:
diff --git a/scripts/supybot-plugin-package b/scripts/supybot-plugin-package
index d7ee069fd..10bed7911 100644
--- a/scripts/supybot-plugin-package
+++ b/scripts/supybot-plugin-package
@@ -51,4 +51,4 @@ if __name__ == '__main__':
         tf.add(dirname, basename, True)
         tf.close()
 
-# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
+# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
diff --git a/scripts/supybot-test b/scripts/supybot-test
index 934dd0429..2bec1826e 100644
--- a/scripts/supybot-test
+++ b/scripts/supybot-test
@@ -203,4 +203,4 @@ if __name__ == '__main__':
     if hasattr(unittest, 'asserts'):
         print 'Total asserts: %s' % unittest.asserts
 
-# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
+# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard
index c5527ccb5..1723afef1 100644
--- a/scripts/supybot-wizard
+++ b/scripts/supybot-wizard
@@ -670,4 +670,4 @@ if __name__ == '__main__':
         it was done.  Unfortunately, I didn't get to write anything to file.
         Please run the wizard again to completion.""")
 
-# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
+# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: