diff --git a/HACKING b/HACKING
index 13446440..cc4983f6 100644
--- a/HACKING
+++ b/HACKING
@@ -14,7 +14,7 @@ Coding Style
 +
 [source,C]
 -------------------------------------------
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
 -------------------------------------------
 
 2.  When opening new blocks such as 'while', 'if', or 'for', leave the opening
@@ -202,5 +202,5 @@ For example, to run valgrind:
     valgrind --leak-check=full -- src/pacman/.libs/lt-pacman -Syu
 
 /////
-vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us:
+vim:set syntax=asciidoc noet spell spelllang=en_us:
 /////
diff --git a/Makefile.am b/Makefile.am
index 2eb71e3b..1f79ba9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,4 +60,4 @@ update-po:
 
 .PHONY: update-po
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/configure.ac b/configure.ac
index 8a7e9d42..45f40f01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -554,4 +554,4 @@ ${PACKAGE_NAME}:
     use git version        : ${wantgitver}
 "
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 99baf951..f6ca3f11 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -107,4 +107,4 @@ rankmirrors: $(srcdir)/rankmirrors.sh.in
 updpkgsums: $(srcdir)/updpkgsums.sh.in
 zsh_completion: $(srcdir)/zsh_completion.in
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in
index 6779bfc5..14919422 100644
--- a/contrib/bacman.sh.in
+++ b/contrib/bacman.sh.in
@@ -355,4 +355,4 @@ msg "Done."
 
 exit 0
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in
index 413b78ac..06e1b125 100644
--- a/contrib/checkupdates.sh.in
+++ b/contrib/checkupdates.sh.in
@@ -48,4 +48,4 @@ pacman -Qqu --dbpath "$CHECKUPDATES_DB" 2> /dev/null
 
 exit 0
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in
index 7c844bb7..039ac8a2 100644
--- a/contrib/paccache.sh.in
+++ b/contrib/paccache.sh.in
@@ -317,4 +317,4 @@ fi
 
 summarize "$pkgcount" "${candidates[@]}"
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in
index 3f62d914..c8fbe74b 100644
--- a/contrib/pacdiff.sh.in
+++ b/contrib/pacdiff.sh.in
@@ -191,4 +191,4 @@ done 3< <(cmd)
 
 exit 0
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/contrib/paclist.sh.in b/contrib/paclist.sh.in
index 319dcba9..1c10b323 100644
--- a/contrib/paclist.sh.in
+++ b/contrib/paclist.sh.in
@@ -65,4 +65,4 @@ pacman -Sl $1 | awk -v i="$installed" '$NF == i { print $2,$3 }'
 # exit with pacman's return value, not awk's
 exit ${PIPESTATUS[0]}
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/contrib/paclog-pkglist.sh.in b/contrib/paclog-pkglist.sh.in
index aaa7586e..5d6f4be8 100644
--- a/contrib/paclog-pkglist.sh.in
+++ b/contrib/paclog-pkglist.sh.in
@@ -96,4 +96,4 @@ END {
 	}
 }' | sort
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/contrib/pacsysclean.sh.in b/contrib/pacsysclean.sh.in
index 36319215..8f2eea38 100644
--- a/contrib/pacsysclean.sh.in
+++ b/contrib/pacsysclean.sh.in
@@ -63,4 +63,4 @@ function format_size(size) {
 	printf("%s\t%s\n", format_size($2), $1);
 }'
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in
index 453ebfbe..7b50eb29 100644
--- a/contrib/rankmirrors.sh.in
+++ b/contrib/rankmirrors.sh.in
@@ -231,4 +231,4 @@ for line in "${linearray[@]}"; do
 done
 finaloutput
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in
index 0f52db4c..7e680b8e 100644
--- a/contrib/updpkgsums.sh.in
+++ b/contrib/updpkgsums.sh.in
@@ -94,4 +94,4 @@ fi
 	' > "$buildfile"
 } < "$buildfile"
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cb012551..a7908dfd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -175,4 +175,4 @@ install-data-hook:
 uninstall-hook:
 	$(RM) $(DESTDIR)$(mandir)/man8/repo-remove.8
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 7a1b91bd..5363f429 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -26,4 +26,4 @@ SED_PROCESS = \
 %.conf: %.conf.in Makefile
 	$(SED_PROCESS)
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am
index e60d570c..f66daedf 100644
--- a/lib/libalpm/Makefile.am
+++ b/lib/libalpm/Makefile.am
@@ -77,4 +77,4 @@ libalpm_la_LIBADD = \
 	$(LIBCURL_LIBS) \
 	$(LIBSSL_LIBS)
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 91b40a16..f38afef8 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -731,4 +731,4 @@ int _alpm_upgrade_packages(alpm_handle_t *handle)
 	return ret;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/add.h b/lib/libalpm/add.h
index 5999d08b..711e0e83 100644
--- a/lib/libalpm/add.h
+++ b/lib/libalpm/add.h
@@ -28,4 +28,4 @@ int _alpm_upgrade_packages(alpm_handle_t *handle);
 
 #endif /* _ALPM_ADD_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index f2e97cee..4a69bf84 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -155,4 +155,4 @@ enum alpm_caps SYMEXPORT alpm_capabilities(void)
 		| 0;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 126f50a5..d67d66a0 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -1359,4 +1359,4 @@ enum alpm_caps alpm_capabilities(void);
 #endif
 #endif /* _ALPM_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c
index cc895684..e881196d 100644
--- a/lib/libalpm/alpm_list.c
+++ b/lib/libalpm/alpm_list.c
@@ -790,4 +790,4 @@ void SYMEXPORT *alpm_list_to_array(const alpm_list_t *list, size_t n,
 
 /** @} */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h
index 9995e882..65b26bec 100644
--- a/lib/libalpm/alpm_list.h
+++ b/lib/libalpm/alpm_list.h
@@ -91,4 +91,4 @@ void *alpm_list_to_array(const alpm_list_t *list, size_t n, size_t size);
 #endif
 #endif /* _ALPM_LIST_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c
index e098c10b..c2989b6d 100644
--- a/lib/libalpm/backup.c
+++ b/lib/libalpm/backup.c
@@ -93,4 +93,4 @@ alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup)
 	return newbackup;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/backup.h b/lib/libalpm/backup.h
index c1585612..3d9d4e53 100644
--- a/lib/libalpm/backup.h
+++ b/lib/libalpm/backup.h
@@ -30,4 +30,4 @@ alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup);
 
 #endif /* _ALPM_BACKUP_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index 6029e120..d6a7b3c0 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -1103,4 +1103,4 @@ alpm_db_t *_alpm_db_register_local(alpm_handle_t *handle)
 	return db;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c
index b672bbed..2fbb1dbb 100644
--- a/lib/libalpm/be_package.c
+++ b/lib/libalpm/be_package.c
@@ -612,4 +612,4 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful
 	return 0;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index 67b7368d..17a8a69f 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -713,4 +713,4 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename,
 	return db;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index 5a6e2be8..369530b7 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -636,4 +636,4 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
 	return conflicts;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h
index f7a667df..8cf36ecb 100644
--- a/lib/libalpm/conflict.h
+++ b/lib/libalpm/conflict.h
@@ -35,4 +35,4 @@ void _alpm_fileconflict_free(alpm_fileconflict_t *conflict);
 
 #endif /* _ALPM_CONFLICT_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index 60423343..b9cbed76 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -708,4 +708,4 @@ alpm_group_t *_alpm_db_get_groupfromcache(alpm_db_t *db, const char *target)
 	return NULL;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h
index 9bfa24f4..3025be9a 100644
--- a/lib/libalpm/db.h
+++ b/lib/libalpm/db.h
@@ -109,4 +109,4 @@ alpm_group_t *_alpm_db_get_groupfromcache(alpm_db_t *db, const char *target);
 
 #endif /* _ALPM_DB_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c
index 6e1ff0a7..baa02b75 100644
--- a/lib/libalpm/delta.c
+++ b/lib/libalpm/delta.c
@@ -352,4 +352,4 @@ alpm_delta_t *_alpm_delta_dup(const alpm_delta_t *delta)
 	return newdelta;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h
index 417b12d9..c57e6c50 100644
--- a/lib/libalpm/delta.h
+++ b/lib/libalpm/delta.h
@@ -32,4 +32,4 @@ off_t _alpm_shortest_delta_path(alpm_handle_t *handle, alpm_list_t *deltas,
 
 #endif /* _ALPM_DELTA_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index 4eb779f7..777f1b90 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -914,4 +914,4 @@ char SYMEXPORT *alpm_dep_compute_string(const alpm_depend_t *dep)
 
 	return str;
 }
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h
index 546521f8..8a8ff46e 100644
--- a/lib/libalpm/deps.h
+++ b/lib/libalpm/deps.h
@@ -42,4 +42,4 @@ int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep);
 
 #endif /* _ALPM_DEPS_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c
index 5b80ef1f..d07b188d 100644
--- a/lib/libalpm/diskspace.c
+++ b/lib/libalpm/diskspace.c
@@ -494,4 +494,4 @@ finish:
 	return 0;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/diskspace.h b/lib/libalpm/diskspace.h
index 4a9314d1..c9fab9b4 100644
--- a/lib/libalpm/diskspace.h
+++ b/lib/libalpm/diskspace.h
@@ -62,4 +62,4 @@ int _alpm_check_downloadspace(alpm_handle_t *handle, const char *cachedir,
 
 #endif /* _ALPM_DISKSPACE_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
index bc59cd14..53867f5b 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -750,4 +750,4 @@ void _alpm_dload_payload_reset(struct dload_payload *payload)
 	memset(payload, '\0', sizeof(*payload));
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h
index 113414c5..10c586e9 100644
--- a/lib/libalpm/dload.h
+++ b/lib/libalpm/dload.h
@@ -53,4 +53,4 @@ int _alpm_download(struct dload_payload *payload, const char *localpath,
 
 #endif /* _ALPM_DLOAD_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c
index b3ebc721..fb6b8564 100644
--- a/lib/libalpm/error.c
+++ b/lib/libalpm/error.c
@@ -163,4 +163,4 @@ const char SYMEXPORT *alpm_strerror(alpm_errno_t err)
 	}
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c
index 7de190db..2d2426c5 100644
--- a/lib/libalpm/filelist.c
+++ b/lib/libalpm/filelist.c
@@ -145,4 +145,4 @@ alpm_file_t SYMEXPORT *alpm_filelist_contains(alpm_filelist_t *filelist,
 			sizeof(alpm_file_t), _alpm_files_cmp);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/filelist.h b/lib/libalpm/filelist.h
index 4f965503..f948cfb5 100644
--- a/lib/libalpm/filelist.h
+++ b/lib/libalpm/filelist.h
@@ -31,4 +31,4 @@ int _alpm_files_cmp(const void *f1, const void *f2);
 
 #endif /* _ALPM_FILELIST_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/graph.c b/lib/libalpm/graph.c
index 837774e1..725b7045 100644
--- a/lib/libalpm/graph.c
+++ b/lib/libalpm/graph.c
@@ -36,4 +36,4 @@ void _alpm_graph_free(void *data)
 	free(graph);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h
index f4045f5a..401260b2 100644
--- a/lib/libalpm/graph.h
+++ b/lib/libalpm/graph.h
@@ -37,4 +37,4 @@ void _alpm_graph_free(void *data);
 
 #endif /* _ALPM_GRAPH_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c
index af71c322..aa51a63c 100644
--- a/lib/libalpm/group.c
+++ b/lib/libalpm/group.c
@@ -50,4 +50,4 @@ void _alpm_group_free(alpm_group_t *grp)
 	FREE(grp);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/group.h b/lib/libalpm/group.h
index 6facaa8f..fb28457c 100644
--- a/lib/libalpm/group.h
+++ b/lib/libalpm/group.h
@@ -27,4 +27,4 @@ void _alpm_group_free(alpm_group_t *grp);
 
 #endif /* _ALPM_GROUP_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 44457e6f..1f41f043 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -674,4 +674,4 @@ alpm_siglevel_t SYMEXPORT alpm_option_get_remote_file_siglevel(alpm_handle_t *ha
 	}
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h
index fcfd4fad..e11d82a1 100644
--- a/lib/libalpm/handle.h
+++ b/lib/libalpm/handle.h
@@ -118,4 +118,4 @@ alpm_errno_t _alpm_set_directory_option(const char *value,
 
 #endif /* _ALPM_HANDLE_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/libarchive-compat.h b/lib/libalpm/libarchive-compat.h
index 584d80e6..7c126416 100644
--- a/lib/libalpm/libarchive-compat.h
+++ b/lib/libalpm/libarchive-compat.h
@@ -70,4 +70,4 @@ static inline int _alpm_archive_read_support_filter_all(struct archive *archive)
 
 #endif /* _LIBARCHIVE_COMPAT_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c
index c4a9d84c..d232bcc3 100644
--- a/lib/libalpm/log.c
+++ b/lib/libalpm/log.c
@@ -92,4 +92,4 @@ void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, const char *fmt, ...
 	va_end(args);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h
index c767bfbd..41f98b20 100644
--- a/lib/libalpm/log.h
+++ b/lib/libalpm/log.h
@@ -29,4 +29,4 @@ void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag,
 
 #endif /* _ALPM_LOG_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index 76e94a9c..e8863f68 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -774,4 +774,4 @@ int SYMEXPORT alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg)
 	return 0;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h
index a972d127..357c20ef 100644
--- a/lib/libalpm/package.h
+++ b/lib/libalpm/package.h
@@ -152,4 +152,4 @@ int _alpm_pkg_compare_versions(alpm_pkg_t *local_pkg, alpm_pkg_t *pkg);
 
 #endif /* _ALPM_PACKAGE_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/pkghash.c b/lib/libalpm/pkghash.c
index a58fff94..2f682784 100644
--- a/lib/libalpm/pkghash.c
+++ b/lib/libalpm/pkghash.c
@@ -348,4 +348,4 @@ alpm_pkg_t *_alpm_pkghash_find(alpm_pkghash_t *hash, const char *name)
 	return NULL;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/rawstr.c b/lib/libalpm/rawstr.c
index 86f4280c..f3f81f5a 100644
--- a/lib/libalpm/rawstr.c
+++ b/lib/libalpm/rawstr.c
@@ -134,4 +134,4 @@ int _alpm_raw_ncmp(const char *first, const char *second, size_t max)
 	return (raw_toupper(*first) - raw_toupper(*second));
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index d78c5f1f..0afca24e 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -758,4 +758,4 @@ int _alpm_remove_packages(alpm_handle_t *handle, int run_ldconfig)
 	return ret;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/remove.h b/lib/libalpm/remove.h
index 8c6bd410..123720ab 100644
--- a/lib/libalpm/remove.h
+++ b/lib/libalpm/remove.h
@@ -33,4 +33,4 @@ int _alpm_remove_single_package(alpm_handle_t *handle,
 
 #endif /* _ALPM_REMOVE_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index 7c887860..caacd24e 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -1070,4 +1070,4 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
 	return 0;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h
index 239bfef1..b414b1f1 100644
--- a/lib/libalpm/signing.h
+++ b/lib/libalpm/signing.h
@@ -36,4 +36,4 @@ int _alpm_key_import(alpm_handle_t *handle, const char *fpr);
 
 #endif /* _ALPM_SIGNING_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 17a3e8e6..f1add246 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -1316,4 +1316,4 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
 	return 0;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h
index 1aeba7d4..f25e450b 100644
--- a/lib/libalpm/sync.h
+++ b/lib/libalpm/sync.h
@@ -29,4 +29,4 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data);
 
 #endif /* _ALPM_SYNC_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index ada8100d..e5328c53 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -405,4 +405,4 @@ alpm_list_t SYMEXPORT *alpm_trans_get_remove(alpm_handle_t *handle)
 
 	return handle->trans->remove;
 }
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h
index 7daa78f5..d2bbcf80 100644
--- a/lib/libalpm/trans.h
+++ b/lib/libalpm/trans.h
@@ -52,4 +52,4 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath,
 
 #endif /* _ALPM_TRANS_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index f28404d7..150b85ea 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -1292,4 +1292,4 @@ void _alpm_alloc_fail(size_t size)
 	fprintf(stderr, "alloc failure: could not allocate %zd bytes\n", size);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h
index c0997c6f..250c5300 100644
--- a/lib/libalpm/util.h
+++ b/lib/libalpm/util.h
@@ -154,4 +154,4 @@ char *strsep(char **, const char *);
 
 #endif /* _ALPM_UTIL_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/lib/libalpm/version.c b/lib/libalpm/version.c
index bc6d4411..00481677 100644
--- a/lib/libalpm/version.c
+++ b/lib/libalpm/version.c
@@ -272,4 +272,4 @@ int SYMEXPORT alpm_pkg_vercmp(const char *a, const char *b)
 	return ret;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 81307045..5d69993e 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -161,4 +161,4 @@ uninstall-hook:
 	cd $(DESTDIR)$(bindir) && \
 		$(RM) repo-remove repo-elephant
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 112c3e0d..7d8a676b 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -3063,4 +3063,4 @@ install_package
 
 exit 0 #E_OK
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in
index 1a7c2584..b0b0ac80 100644
--- a/scripts/pacman-db-upgrade.sh.in
+++ b/scripts/pacman-db-upgrade.sh.in
@@ -127,4 +127,4 @@ fi
 # remove the lock file
 rm -f "$lockfile"
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 27410b8a..82340f9f 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -627,4 +627,4 @@ fi
 
 exit 0
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in
index f0e82228..93742695 100644
--- a/scripts/pacman-optimize.sh.in
+++ b/scripts/pacman-optimize.sh.in
@@ -186,4 +186,4 @@ echo
 
 exit 0
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in
index cc1f9ac2..be49326e 100644
--- a/scripts/pkgdelta.sh.in
+++ b/scripts/pkgdelta.sh.in
@@ -223,4 +223,4 @@ fi
 
 create_xdelta "$@"
 
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index dfa8b169..dd3dba3e 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -739,4 +739,4 @@ else
 fi
 
 exit 0
-# vim: set ts=2 sw=2 noet:
+# vim: set noet:
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 49503333..ba402b2d 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = \
 	util-common.h util-common.c
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/src/common/util-common.c b/src/common/util-common.c
index 5a162127..c5097ddf 100644
--- a/src/common/util-common.c
+++ b/src/common/util-common.c
@@ -107,4 +107,4 @@ char *strndup(const char *s, size_t n)
 }
 #endif
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/common/util-common.h b/src/common/util-common.h
index 6853f18e..e28c60d9 100644
--- a/src/common/util-common.h
+++ b/src/common/util-common.h
@@ -29,4 +29,4 @@ char *strndup(const char *s, size_t n);
 
 #endif /* _PM_UTIL_COMMON_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am
index f7272c65..5f103081 100644
--- a/src/pacman/Makefile.am
+++ b/src/pacman/Makefile.am
@@ -44,4 +44,4 @@ pacman_SOURCES = \
 
 LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 4b0f881a..1b5d8f66 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -784,4 +784,4 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args)
 	}
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/callback.h b/src/pacman/callback.h
index 61a7e4c4..882210f4 100644
--- a/src/pacman/callback.h
+++ b/src/pacman/callback.h
@@ -46,4 +46,4 @@ void cb_log(alpm_loglevel_t level, const char *fmt, va_list args);
 
 #endif /* _PM_CALLBACK_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/check.c b/src/pacman/check.c
index f4649253..a7c66baa 100644
--- a/src/pacman/check.c
+++ b/src/pacman/check.c
@@ -363,4 +363,4 @@ int check_pkg_full(alpm_pkg_t *pkg)
 	return (errors != 0 ? 1 : 0);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/check.h b/src/pacman/check.h
index 3dfd9471..c2940dd3 100644
--- a/src/pacman/check.h
+++ b/src/pacman/check.h
@@ -27,4 +27,4 @@ int check_pkg_full(alpm_pkg_t *pkg);
 
 #endif /* _PM_CHECK_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index 5450f3b3..4b7ec051 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -953,4 +953,4 @@ int parseconfig(const char *file)
 	return parse_ini(file, _parse_directive, &section);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index 9faf5de7..e8cac509 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -209,4 +209,4 @@ int config_set_arch(const char *arch);
 int parseconfig(const char *file);
 #endif /* _PM_CONF_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/database.c b/src/pacman/database.c
index eebcb504..e858e0c8 100644
--- a/src/pacman/database.c
+++ b/src/pacman/database.c
@@ -85,4 +85,4 @@ int pacman_database(alpm_list_t *targets)
 	return retval;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c
index 5449df66..511c398d 100644
--- a/src/pacman/deptest.c
+++ b/src/pacman/deptest.c
@@ -54,4 +54,4 @@ int pacman_deptest(alpm_list_t *targets)
 	return 127;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/ini.c b/src/pacman/ini.c
index 554935b8..2a3ef0ed 100644
--- a/src/pacman/ini.c
+++ b/src/pacman/ini.c
@@ -214,4 +214,4 @@ int parse_ini(const char *file, ini_parser_fn cb, void *data)
 	return _parse_ini(file, cb, data, &section_name, line, 0);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/ini.h b/src/pacman/ini.h
index fc881a25..23786a09 100644
--- a/src/pacman/ini.h
+++ b/src/pacman/ini.h
@@ -27,4 +27,4 @@ int parse_ini(const char *file, ini_parser_fn cb, void *data);
 
 #endif /* _PM_CONF_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/package.c b/src/pacman/package.c
index 8ccdc1b6..e4d3e3ab 100644
--- a/src/pacman/package.c
+++ b/src/pacman/package.c
@@ -448,4 +448,4 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status)
 	return 0;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/package.h b/src/pacman/package.h
index 6f0e0822..a6f02b97 100644
--- a/src/pacman/package.h
+++ b/src/pacman/package.h
@@ -33,4 +33,4 @@ int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status);
 
 #endif /* _PM_PACKAGE_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 748bc546..71443394 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -1217,4 +1217,4 @@ int main(int argc, char *argv[])
 	return EXIT_SUCCESS;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h
index fb5856a1..7b33a74e 100644
--- a/src/pacman/pacman.h
+++ b/src/pacman/pacman.h
@@ -40,4 +40,4 @@ int pacman_upgrade(alpm_list_t *targets);
 
 #endif /* _PM_PACMAN_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/query.c b/src/pacman/query.c
index d832d98b..477e4fed 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -506,4 +506,4 @@ int pacman_query(alpm_list_t *targets)
 	return ret;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index aefe4548..56b93334 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -182,4 +182,4 @@ cleanup:
 	return retval;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 5ed43ed1..f6ee57a8 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -957,4 +957,4 @@ int pacman_sync(alpm_list_t *targets)
 	return sync_trans(targets);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c
index 0bf8d228..5416f618 100644
--- a/src/pacman/upgrade.c
+++ b/src/pacman/upgrade.c
@@ -119,4 +119,4 @@ int pacman_upgrade(alpm_list_t *targets)
 	return sync_prepare_execute();
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/util.c b/src/pacman/util.c
index f6ccaf89..cbe371d6 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -1665,4 +1665,4 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list
 	return ret;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/pacman/util.h b/src/pacman/util.h
index 747a67ec..94a6dc8b 100644
--- a/src/pacman/util.h
+++ b/src/pacman/util.h
@@ -82,4 +82,4 @@ int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_li
 
 #endif /* _PM_UTIL_H */
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index d539fa26..a0075887 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -35,4 +35,4 @@ testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la
 vercmp_SOURCES = vercmp.c
 vercmp_LDADD = $(top_builddir)/lib/libalpm/libalpm_la-version.lo
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c
index b57b2038..4a67fc38 100644
--- a/src/util/cleanupdelta.c
+++ b/src/util/cleanupdelta.c
@@ -134,4 +134,4 @@ int main(int argc, char *argv[])
 	cleanup(0);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/util/pacsort.c b/src/util/pacsort.c
index 443e822e..948b03d3 100644
--- a/src/util/pacsort.c
+++ b/src/util/pacsort.c
@@ -458,4 +458,4 @@ int main(int argc, char *argv[])
 	return 0;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/util/pactree.c b/src/util/pactree.c
index bd6e9dd9..4192999d 100644
--- a/src/util/pactree.c
+++ b/src/util/pactree.c
@@ -559,4 +559,4 @@ finish:
 	return ret;
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/src/util/testdb.c b/src/util/testdb.c
index 53cdb3c1..e3b331ab 100644
--- a/src/util/testdb.c
+++ b/src/util/testdb.c
@@ -294,4 +294,4 @@ int main(int argc, char *argv[])
 	cleanup(errors > 0);
 }
 
-/* vim: set ts=2 sw=2 noet: */
+/* vim: set noet: */
diff --git a/test/pacman/Makefile.am b/test/pacman/Makefile.am
index 55e3c7a8..f71333c4 100644
--- a/test/pacman/Makefile.am
+++ b/test/pacman/Makefile.am
@@ -20,4 +20,4 @@ EXTRA_DIST = \
 	ldconfig.stub \
 	$(check_SCRIPTS)
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/test/pacman/tests/Makefile.am b/test/pacman/tests/Makefile.am
index 9ab0c777..dba84e3d 100644
--- a/test/pacman/tests/Makefile.am
+++ b/test/pacman/tests/Makefile.am
@@ -22,4 +22,4 @@ $(CONFTESTS): Makefile
 	$(AM_V_at)chmod a-w $@.tmp
 	$(AM_V_at)mv $@.tmp $@
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/test/scripts/Makefile.am b/test/scripts/Makefile.am
index d525d894..5dca9a46 100644
--- a/test/scripts/Makefile.am
+++ b/test/scripts/Makefile.am
@@ -7,4 +7,4 @@ noinst_SCRIPTS = $(check_SCRIPTS)
 EXTRA_DIST = \
 	$(check_SCRIPTS)
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet:
diff --git a/test/util/Makefile.am b/test/util/Makefile.am
index 5839f37e..0a9f7ead 100644
--- a/test/util/Makefile.am
+++ b/test/util/Makefile.am
@@ -7,4 +7,4 @@ noinst_SCRIPTS = $(check_SCRIPTS)
 EXTRA_DIST = \
 	$(check_SCRIPTS)
 
-# vim:set ts=2 sw=2 noet:
+# vim:set noet: