diff --git a/src/addhead.cpp b/src/addhead.cpp
index e3157eb..19a44cc 100644
--- a/src/addhead.cpp
+++ b/src/addhead.cpp
@@ -279,9 +279,9 @@ bool AdditionalHeader::Dump() const
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/addhead.h b/src/addhead.h
index 883ad55..350ef79 100644
--- a/src/addhead.h
+++ b/src/addhead.h
@@ -62,9 +62,9 @@ class AdditionalHeader
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/cache.cpp b/src/cache.cpp
index 8b6642e..35c22f6 100644
--- a/src/cache.cpp
+++ b/src/cache.cpp
@@ -799,9 +799,9 @@ bool convert_header_to_stat(const char* path, headers_t& meta, struct stat* pst,
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/cache.h b/src/cache.h
index 4d948e8..6c96785 100644
--- a/src/cache.h
+++ b/src/cache.h
@@ -168,9 +168,9 @@ bool convert_header_to_stat(const char* path, headers_t& meta, struct stat* pst,
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/common.h b/src/common.h
index 5b2ff35..421caca 100644
--- a/src/common.h
+++ b/src/common.h
@@ -204,9 +204,9 @@ extern const char*    s3fs_log_nest[S3FS_LOG_NEST_MAX];
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/common_auth.cpp b/src/common_auth.cpp
index eb363a1..4cd0d3e 100644
--- a/src/common_auth.cpp
+++ b/src/common_auth.cpp
@@ -88,9 +88,9 @@ string s3fs_sha256sum(int fd, off_t start, ssize_t size)
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/curl.cpp b/src/curl.cpp
index 5a25014..276ac65 100644
--- a/src/curl.cpp
+++ b/src/curl.cpp
@@ -4923,9 +4923,9 @@ acl_t string_to_acl(const char *acl)
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/curl.h b/src/curl.h
index a9ffdaa..d5be20d 100644
--- a/src/curl.h
+++ b/src/curl.h
@@ -605,9 +605,9 @@ acl_t string_to_acl(const char *acl);
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/fdcache.cpp b/src/fdcache.cpp
index e08ac2b..a93b8cb 100644
--- a/src/fdcache.cpp
+++ b/src/fdcache.cpp
@@ -3505,9 +3505,9 @@ bool FdManager::CheckAllCache()
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/fdcache.h b/src/fdcache.h
index ffd4c73..88b9445 100644
--- a/src/fdcache.h
+++ b/src/fdcache.h
@@ -282,9 +282,9 @@ class FdManager
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/gnutls_auth.cpp b/src/gnutls_auth.cpp
index 1395ccd..6d2c9c8 100644
--- a/src/gnutls_auth.cpp
+++ b/src/gnutls_auth.cpp
@@ -388,9 +388,9 @@ unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size)
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/nss_auth.cpp b/src/nss_auth.cpp
index 15a726e..e0c02ea 100644
--- a/src/nss_auth.cpp
+++ b/src/nss_auth.cpp
@@ -260,9 +260,9 @@ unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size)
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/openssl_auth.cpp b/src/openssl_auth.cpp
index bd57eef..35cb867 100644
--- a/src/openssl_auth.cpp
+++ b/src/openssl_auth.cpp
@@ -360,9 +360,9 @@ unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size)
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/psemaphore.h b/src/psemaphore.h
index 25233cf..bbc8af8 100644
--- a/src/psemaphore.h
+++ b/src/psemaphore.h
@@ -73,3 +73,11 @@ class Semaphore
 #endif
 
 #endif // S3FS_SEMAPHORE_H_
+/*
+* Local variables:
+* tab-width: 2
+* c-basic-offset: 2
+* End:
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
+*/
diff --git a/src/s3fs.cpp b/src/s3fs.cpp
index 92c11c4..078cb42 100644
--- a/src/s3fs.cpp
+++ b/src/s3fs.cpp
@@ -5621,9 +5621,9 @@ int main(int argc, char* argv[])
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/s3fs.h b/src/s3fs.h
index 8f048fd..2bff010 100644
--- a/src/s3fs.h
+++ b/src/s3fs.h
@@ -85,9 +85,9 @@ do{ \
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/s3fs_auth.h b/src/s3fs_auth.h
index b5b37eb..bd5af01 100644
--- a/src/s3fs_auth.h
+++ b/src/s3fs_auth.h
@@ -53,9 +53,9 @@ unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size);
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/s3fs_util.cpp b/src/s3fs_util.cpp
index 726a3e1..a41250e 100644
--- a/src/s3fs_util.cpp
+++ b/src/s3fs_util.cpp
@@ -1585,9 +1585,9 @@ void show_version()
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/s3fs_util.h b/src/s3fs_util.h
index d71f354..781fdae 100644
--- a/src/s3fs_util.h
+++ b/src/s3fs_util.h
@@ -153,9 +153,9 @@ void show_version(void);
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/sighandlers.cpp b/src/sighandlers.cpp
index a1edc82..9b188d8 100644
--- a/src/sighandlers.cpp
+++ b/src/sighandlers.cpp
@@ -278,9 +278,9 @@ bool S3fsSignals::WakeupUsr1Thread()
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/sighandlers.h b/src/sighandlers.h
index 0bebcef..c071245 100644
--- a/src/sighandlers.h
+++ b/src/sighandlers.h
@@ -65,9 +65,9 @@ class S3fsSignals
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/string_util.cpp b/src/string_util.cpp
index 6251d6c..2ea0455 100644
--- a/src/string_util.cpp
+++ b/src/string_util.cpp
@@ -591,9 +591,9 @@ string s3fs_wtf8_decode(const string &s)
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/string_util.h b/src/string_util.h
index 3562eb6..7318208 100644
--- a/src/string_util.h
+++ b/src/string_util.h
@@ -69,9 +69,9 @@ std::string s3fs_wtf8_decode(const std::string &s);
 
 /*
 * Local variables:
-* tab-width: 4
-* c-basic-offset: 4
+* tab-width: 2
+* c-basic-offset: 2
 * End:
-* vim600: noet sw=4 ts=4 fdm=marker
-* vim<600: noet sw=4 ts=4
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
 */
diff --git a/src/test_string_util.cpp b/src/test_string_util.cpp
index 6e619ff..733e0a8 100644
--- a/src/test_string_util.cpp
+++ b/src/test_string_util.cpp
@@ -134,3 +134,12 @@ int main(int argc, char *argv[])
   test_wtf8_encoding();
   return 0;
 }
+
+/*
+* Local variables:
+* tab-width: 2
+* c-basic-offset: 2
+* End:
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
+*/
diff --git a/src/test_util.h b/src/test_util.h
index f405297..1b9b9f4 100644
--- a/src/test_util.h
+++ b/src/test_util.h
@@ -87,3 +87,12 @@ void assert_strequals(const char *x, const char *y, const char *file, int line)
 
 #define ASSERT_STREQUALS(x, y) \
   assert_strequals((x), (y), __FILE__, __LINE__)
+
+/*
+* Local variables:
+* tab-width: 2
+* c-basic-offset: 2
+* End:
+* vim600: expandtab sw=2 ts=2 fdm=marker
+* vim<600: expandtab sw=2 ts=2
+*/