diff --git a/README.SRC b/README.SRC
index 3c5d84a9..2f9259bd 100644
--- a/README.SRC
+++ b/README.SRC
@@ -138,4 +138,4 @@ Patches/Contributions
       diff -uNr olddirectory newdirectory
 
 
-# vi:ts=4:et
+# vim:set ts=4 sw=4 et:
diff --git a/src/filter/ct.h b/src/filter/ct.h
index c42cbc80..eed87848 100644
--- a/src/filter/ct.h
+++ b/src/filter/ct.h
@@ -459,7 +459,4 @@ static int s_ct24arm_be(Filter *f)
 #undef CT24ARM_BE
 #undef ARMCT_COND
 
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter/cto.h b/src/filter/cto.h
index e805e76a..3523b611 100644
--- a/src/filter/cto.h
+++ b/src/filter/cto.h
@@ -169,8 +169,4 @@ static int U(Filter *f)
 #undef F
 #undef U
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter/ctoj.h b/src/filter/ctoj.h
index 066056b4..4e7ab7e3 100644
--- a/src/filter/ctoj.h
+++ b/src/filter/ctoj.h
@@ -168,8 +168,4 @@ static int U(Filter *f)
 #undef F
 #undef U
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter/ctojr.h b/src/filter/ctojr.h
index 71f6e593..7abf47f1 100644
--- a/src/filter/ctojr.h
+++ b/src/filter/ctojr.h
@@ -344,8 +344,4 @@ static int U(Filter *f)
 #undef F
 #undef U
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter/ctok.h b/src/filter/ctok.h
index 76ce4e94..8dc25c7d 100644
--- a/src/filter/ctok.h
+++ b/src/filter/ctok.h
@@ -171,8 +171,4 @@ static int U(Filter *f)
 #undef F
 #undef U
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter/ctsw.h b/src/filter/ctsw.h
index 274c6fb1..237bf0f4 100644
--- a/src/filter/ctsw.h
+++ b/src/filter/ctsw.h
@@ -166,8 +166,4 @@ static int s_ctsw32_e9_e8(Filter *f)
 
 #undef CTSW32
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter/getcto.h b/src/filter/getcto.h
index 59ddca59..e65b323c 100644
--- a/src/filter/getcto.h
+++ b/src/filter/getcto.h
@@ -67,9 +67,4 @@ static int getcto(Filter *f, const unsigned char *buf, const int n=256)
     return ic;
 }
 
-
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter/ppcbxx.h b/src/filter/ppcbxx.h
index 548e8534..a79c651f 100644
--- a/src/filter/ppcbxx.h
+++ b/src/filter/ppcbxx.h
@@ -153,7 +153,4 @@ static int U(Filter *f)
 
 #undef W_CTO
 
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter/sub.hh b/src/filter/sub.hh
index ca7b298d..570fb049 100644
--- a/src/filter/sub.hh
+++ b/src/filter/sub.hh
@@ -79,9 +79,4 @@
     assert((int)f->calls > 0); \
     return 0;
 
-
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter/sub16.h b/src/filter/sub16.h
index 0eb92a1a..ddeb39a9 100644
--- a/src/filter/sub16.h
+++ b/src/filter/sub16.h
@@ -115,8 +115,4 @@ static int s_sub16_4(Filter *f)
 #undef ADD16
 #undef SCAN16
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter/sub32.h b/src/filter/sub32.h
index 1a811862..06377d1a 100644
--- a/src/filter/sub32.h
+++ b/src/filter/sub32.h
@@ -115,8 +115,4 @@ static int s_sub32_4(Filter *f)
 #undef ADD32
 #undef SCAN32
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter/sub8.h b/src/filter/sub8.h
index 8e440e8e..c7327443 100644
--- a/src/filter/sub8.h
+++ b/src/filter/sub8.h
@@ -115,8 +115,4 @@ static int s_sub8_4(Filter *f)
 #undef ADD8
 #undef SCAN8
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter/sw.h b/src/filter/sw.h
index 4a71b0c3..34b4355c 100644
--- a/src/filter/sw.h
+++ b/src/filter/sw.h
@@ -180,9 +180,4 @@ static int s_sw32_e8e9(Filter *f)
 
 #undef SW32
 
-
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_lx_exc.h b/src/p_lx_exc.h
index 63f9f6e8..99fce650 100644
--- a/src/p_lx_exc.h
+++ b/src/p_lx_exc.h
@@ -145,8 +145,4 @@ protected:
 };
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/Makefile b/src/stub/Makefile
index 4168f25b..0c9193de 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -1439,5 +1439,4 @@ extra-clean: $$(filter %.~clean,$$(EXTRA_MAKEFILES.targets))
 .PHONY: extra-all extra-clean $(EXTRA_MAKEFILES.targets)
 endif
 
-
-# vi:ts=8:noet:nowrap
+# vim:set ts=8 sw=8 noet:
diff --git a/src/stub/src/include/bsd.h b/src/stub/src/include/bsd.h
index b52678bd..db55b7c1 100644
--- a/src/stub/src/include/bsd.h
+++ b/src/stub/src/include/bsd.h
@@ -362,8 +362,4 @@ struct p_info       // 12-byte packed program header follows stub loader
 #  define __attribute_cdecl /*empty*/
 #endif
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/include/darwin.h b/src/stub/src/include/darwin.h
index 5aebedf1..c2b7c804 100644
--- a/src/stub/src/include/darwin.h
+++ b/src/stub/src/include/darwin.h
@@ -122,8 +122,4 @@ typedef unsigned int nrv_uint;
 #  define __attribute_cdecl /*empty*/
 #endif
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/include/header.S b/src/stub/src/include/header.S
index 4fadfa54..6500c336 100644
--- a/src/stub/src/include/header.S
+++ b/src/stub/src/include/header.S
@@ -56,5 +56,4 @@ section         UPX1HEAD
                 .byte   45              // 31  header checksum
 #endif
 
-
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/include/linux.h b/src/stub/src/include/linux.h
index a4ad40f3..8083b023 100644
--- a/src/stub/src/include/linux.h
+++ b/src/stub/src/include/linux.h
@@ -749,8 +749,4 @@ struct p_info       // 12-byte packed program header follows stub loader
 #  define __attribute_cdecl /*empty*/
 #endif
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */