diff --git a/src/bptr.h b/src/bptr.h
index 4cfbf253..c639bd43 100644
--- a/src/bptr.h
+++ b/src/bptr.h
@@ -103,8 +103,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/c_file.cpp b/src/c_file.cpp
index b446dd63..d2fbb20f 100644
--- a/src/c_file.cpp
+++ b/src/c_file.cpp
@@ -89,8 +89,4 @@ console_t console_file =
 
 #endif /* USE_CONSOLE */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/c_init.cpp b/src/c_init.cpp
index 57e879bc..6b17fd2d 100644
--- a/src/c_init.cpp
+++ b/src/c_init.cpp
@@ -159,8 +159,4 @@ void __acc_cdecl_va con_fprintf(FILE *f, const char *format, ...)
 
 #endif /* USE_CONSOLE */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/c_none.cpp b/src/c_none.cpp
index 266fc06e..d650f485 100644
--- a/src/c_none.cpp
+++ b/src/c_none.cpp
@@ -75,8 +75,4 @@ console_t console_none =
 
 #endif /* USE_CONSOLE */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/c_screen.cpp b/src/c_screen.cpp
index 34337e60..5111157b 100644
--- a/src/c_screen.cpp
+++ b/src/c_screen.cpp
@@ -317,8 +317,4 @@ console_t console_screen =
 
 #endif /* USE_SCREEN */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/compress.cpp b/src/compress.cpp
index 802ea512..7fa0eb10 100644
--- a/src/compress.cpp
+++ b/src/compress.cpp
@@ -215,8 +215,4 @@ int upx_test_overlap       ( const upx_bytep buf,
     return r;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/compress.h b/src/compress.h
index 729899a5..047a7b89 100644
--- a/src/compress.h
+++ b/src/compress.h
@@ -128,8 +128,4 @@ unsigned upx_zlib_crc32  (const void *buf, unsigned len, unsigned crc);
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/compress_lzma.cpp b/src/compress_lzma.cpp
index 498f82c8..d5e42404 100644
--- a/src/compress_lzma.cpp
+++ b/src/compress_lzma.cpp
@@ -813,7 +813,5 @@ const char *upx_lzma_version_string(void)
 
 
 #endif /* WITH_LZMA */
-/*
-vi:ts=4:et:nowrap
-*/
 
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/compress_ucl.cpp b/src/compress_ucl.cpp
index efed484f..2e8acdc9 100644
--- a/src/compress_ucl.cpp
+++ b/src/compress_ucl.cpp
@@ -306,7 +306,5 @@ unsigned upx_ucl_crc32(const void *buf, unsigned len, unsigned crc)
 #endif
 
 #endif /* WITH_UCL */
-/*
-vi:ts=4:et:nowrap
-*/
 
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/compress_zlib.cpp b/src/compress_zlib.cpp
index ebb113cc..141cdea9 100644
--- a/src/compress_zlib.cpp
+++ b/src/compress_zlib.cpp
@@ -250,7 +250,5 @@ unsigned upx_zlib_crc32(const void *buf, unsigned len, unsigned crc)
 
 
 #endif /* WITH_ZLIB */
-/*
-vi:ts=4:et:nowrap
-*/
 
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/conf.h b/src/conf.h
index 73bdd72f..d06d9862 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -719,8 +719,4 @@ int upx_test_overlap       ( const upx_bytep buf,
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/console.h b/src/console.h
index f49289c1..2297fb94 100644
--- a/src/console.h
+++ b/src/console.h
@@ -187,8 +187,4 @@ extern console_t console_screen;
 
 #endif /* USE_CONSOLE */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/except.cpp b/src/except.cpp
index 2057c806..871127b0 100644
--- a/src/except.cpp
+++ b/src/except.cpp
@@ -205,8 +205,4 @@ const char *prettyName(const char *n) NOTHROW
     return n;
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/except.h b/src/except.h
index 3fb1ec23..dff50e9c 100644
--- a/src/except.h
+++ b/src/except.h
@@ -230,8 +230,4 @@ void throwEOFException(const char *msg = NULL, int e = 0) NORET;
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/file.cpp b/src/file.cpp
index 0e30bee7..90ff7669 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -492,8 +492,4 @@ void MemoryOutputFile::write(const void *buf, int len)
 
 #endif /* if 0 */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/file.h b/src/file.h
index 23279743..0f5878cc 100644
--- a/src/file.h
+++ b/src/file.h
@@ -185,8 +185,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter.cpp b/src/filter.cpp
index a96a8c2e..65ee4ac9 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -228,8 +228,4 @@ bool Filter::scan(const upx_byte *buf_, unsigned buf_len_)
     return false;
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filter.h b/src/filter.h
index 33d01cd4..d2ac54ec 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -131,8 +131,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/filteri.cpp b/src/filteri.cpp
index b9896c4c..2748866c 100644
--- a/src/filteri.cpp
+++ b/src/filteri.cpp
@@ -260,8 +260,4 @@ const FilterImp::FilterEntry FilterImp::filters[] = {
 
 const int FilterImp::n_filters = TABLESIZE(filters);
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/help.cpp b/src/help.cpp
index e6fc8a17..5fd80c13 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -419,8 +419,4 @@ void show_version(int x)
     fprintf(fp, "UPX comes with ABSOLUTELY NO WARRANTY; for details type '%s -L'.\n", progname);
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/lefile.cpp b/src/lefile.cpp
index 5e11e59f..3497acde 100644
--- a/src/lefile.cpp
+++ b/src/lefile.cpp
@@ -360,8 +360,4 @@ void LeFile::countFixups(unsigned *counts) const
     counts[o+1] += 4; // extra space for 0xFFFFFFFF
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/lefile.h b/src/lefile.h
index a4dc4f31..38304636 100644
--- a/src/lefile.h
+++ b/src/lefile.h
@@ -221,8 +221,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/linker.cpp b/src/linker.cpp
index 21241029..075d2f18 100644
--- a/src/linker.cpp
+++ b/src/linker.cpp
@@ -967,8 +967,4 @@ void ElfLinkerX86::relocate1(const Relocation *rel, upx_byte *location,
         super::relocate1(rel, location, value, type);
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/linker.h b/src/linker.h
index 3906bb0e..27809c9d 100644
--- a/src/linker.h
+++ b/src/linker.h
@@ -263,8 +263,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/main.cpp b/src/main.cpp
index a230f2fe..fab1a985 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1570,8 +1570,4 @@ int __acc_cdecl_main main(int argc, char *argv[])
 
 #endif /* !(WITH_GUI) */
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/msg.cpp b/src/msg.cpp
index c42f967a..200bda72 100644
--- a/src/msg.cpp
+++ b/src/msg.cpp
@@ -253,8 +253,4 @@ void infoWriting(const char *what, long size)
     info("Writing %s: %ld bytes", what, size);
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/options.h b/src/options.h
index 33b2bb50..7e1aad57 100644
--- a/src/options.h
+++ b/src/options.h
@@ -168,8 +168,4 @@ extern struct options_t *opt;
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_armpe.cpp b/src/p_armpe.cpp
index 103d9a43..23df1bb0 100644
--- a/src/p_armpe.cpp
+++ b/src/p_armpe.cpp
@@ -259,7 +259,4 @@ void PackArmPe::pack(OutputFile *fo)
     super::pack0(fo, 1U << 9, 0x10000, true);
 }
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_armpe.h b/src/p_armpe.h
index 14bdb29f..a7c3b84a 100644
--- a/src/p_armpe.h
+++ b/src/p_armpe.h
@@ -78,7 +78,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_com.cpp b/src/p_com.cpp
index 537c1dda..e6cc6af8 100644
--- a/src/p_com.cpp
+++ b/src/p_com.cpp
@@ -266,8 +266,4 @@ Linker* PackCom::newLinker() const
     return new ElfLinkerX86();
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_com.h b/src/p_com.h
index 15a6c0cd..deb63b06 100644
--- a/src/p_com.h
+++ b/src/p_com.h
@@ -66,8 +66,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_djgpp2.cpp b/src/p_djgpp2.cpp
index 4dc245fd..0f8d889b 100644
--- a/src/p_djgpp2.cpp
+++ b/src/p_djgpp2.cpp
@@ -469,8 +469,4 @@ void PackDjgpp2::unpack(OutputFile *fo)
         handle_allegropak(fi, fo);
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_djgpp2.h b/src/p_djgpp2.h
index bcd14a3b..4069c1db 100644
--- a/src/p_djgpp2.h
+++ b/src/p_djgpp2.h
@@ -107,8 +107,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_elf.h b/src/p_elf.h
index c70073c5..a5793a6b 100644
--- a/src/p_elf.h
+++ b/src/p_elf.h
@@ -438,8 +438,4 @@ typedef ElfClass_LE64::External_Note    Elf_LE64_External_Note;
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_elf_enum.h b/src/p_elf_enum.h
index 447f5127..fc7867be 100644
--- a/src/p_elf_enum.h
+++ b/src/p_elf_enum.h
@@ -245,7 +245,4 @@
     };
 #endif
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_elks.cpp b/src/p_elks.cpp
index 344ebb48..a8232c7e 100644
--- a/src/p_elks.cpp
+++ b/src/p_elks.cpp
@@ -171,9 +171,4 @@ void PackElks8086::unpack(OutputFile *)
 
 #endif /* if 0 */
 
-
-/*
-vi:ts=4:et
-*/
-
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_exe.cpp b/src/p_exe.cpp
index b802e24f..adba1772 100644
--- a/src/p_exe.cpp
+++ b/src/p_exe.cpp
@@ -870,8 +870,4 @@ DDnneelllCCCCCCCCCCCCCCCCCCCCCCCCC
 
 */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_exe.h b/src/p_exe.h
index d0bf5e85..3438c217 100644
--- a/src/p_exe.h
+++ b/src/p_exe.h
@@ -118,8 +118,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_lx_exc.cpp b/src/p_lx_exc.cpp
index a189117e..7965c1f4 100644
--- a/src/p_lx_exc.cpp
+++ b/src/p_lx_exc.cpp
@@ -614,8 +614,4 @@ void PackLinuxI386::updateLoader(OutputFile *fo)
     elfout.ehdr.e_entry = fo->getBytesWritten() + elfout.phdr[0].p_vaddr;
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_lx_interp.cpp b/src/p_lx_interp.cpp
index 24aab8e2..31d2a8ab 100644
--- a/src/p_lx_interp.cpp
+++ b/src/p_lx_interp.cpp
@@ -306,8 +306,4 @@ void PackLinuxElf32x86interp::unpack(OutputFile *fo)
 #undef MAX_INTERP_HDR
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_lx_interp.h b/src/p_lx_interp.h
index d97cbfc6..8e04d6eb 100644
--- a/src/p_lx_interp.h
+++ b/src/p_lx_interp.h
@@ -61,8 +61,4 @@ protected:
 
 #endif /*} already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_lx_sh.cpp b/src/p_lx_sh.cpp
index f8750cee..b02df499 100644
--- a/src/p_lx_sh.cpp
+++ b/src/p_lx_sh.cpp
@@ -168,7 +168,4 @@ PackLinuxI386sh::pack3(OutputFile *fo, Filter &ft)
     elfout.phdr[0].p_filesz = fo->getBytesWritten();
 }
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_lx_sh.h b/src/p_lx_sh.h
index d5eb0edf..7563f28d 100644
--- a/src/p_lx_sh.h
+++ b/src/p_lx_sh.h
@@ -71,8 +71,4 @@ protected:
 
 #endif /*} already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_mach.cpp b/src/p_mach.cpp
index d175fed8..890f12f8 100644
--- a/src/p_mach.cpp
+++ b/src/p_mach.cpp
@@ -2501,6 +2501,4 @@ void PackMachFat::list()
     assert(false);
 }
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_mach.h b/src/p_mach.h
index a82f00ab..662188cd 100644
--- a/src/p_mach.h
+++ b/src/p_mach.h
@@ -1071,8 +1071,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_mach_enum.h b/src/p_mach_enum.h
index fe7f62de..8bf15968 100644
--- a/src/p_mach_enum.h
+++ b/src/p_mach_enum.h
@@ -149,7 +149,4 @@
     };
 #endif  /*}*/
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_ps1.cpp b/src/p_ps1.cpp
index fad61b84..da589f65 100644
--- a/src/p_ps1.cpp
+++ b/src/p_ps1.cpp
@@ -738,7 +738,4 @@ void PackPs1::unpack(OutputFile *fo)
     }
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_ps1.h b/src/p_ps1.h
index c147f7e3..ce60965d 100644
--- a/src/p_ps1.h
+++ b/src/p_ps1.h
@@ -130,7 +130,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_sys.cpp b/src/p_sys.cpp
index acdb24b3..f9ab013c 100644
--- a/src/p_sys.cpp
+++ b/src/p_sys.cpp
@@ -125,8 +125,4 @@ void PackSys::buildLoader(const Filter *ft)
              );
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_sys.h b/src/p_sys.h
index 8b22a669..52b3ff27 100644
--- a/src/p_sys.h
+++ b/src/p_sys.h
@@ -58,8 +58,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_tmt.cpp b/src/p_tmt.cpp
index 51a2b3ac..34ee6755 100644
--- a/src/p_tmt.cpp
+++ b/src/p_tmt.cpp
@@ -360,8 +360,4 @@ void PackTmt::unpack(OutputFile *fo)
     copyOverlay(fo, overlay, &obuf);
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_tmt.h b/src/p_tmt.h
index 79864385..36f572ec 100644
--- a/src/p_tmt.h
+++ b/src/p_tmt.h
@@ -79,8 +79,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_tos.cpp b/src/p_tos.cpp
index f5938b73..18543abb 100644
--- a/src/p_tos.cpp
+++ b/src/p_tos.cpp
@@ -774,8 +774,4 @@ void PackTos::unpack(OutputFile *fo)
     }
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_tos.h b/src/p_tos.h
index 208578bf..9ebed27e 100644
--- a/src/p_tos.h
+++ b/src/p_tos.h
@@ -108,8 +108,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_unix.cpp b/src/p_unix.cpp
index 153a18e6..7a164f7d 100644
--- a/src/p_unix.cpp
+++ b/src/p_unix.cpp
@@ -638,8 +638,4 @@ void PackUnix::unpack(OutputFile *fo)
         throwChecksumError();
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_unix.h b/src/p_unix.h
index 3bedc764..0f8e818d 100644
--- a/src/p_unix.h
+++ b/src/p_unix.h
@@ -216,8 +216,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_vmlinx.cpp b/src/p_vmlinx.cpp
index 761a20a4..93fba057 100644
--- a/src/p_vmlinx.cpp
+++ b/src/p_vmlinx.cpp
@@ -1215,8 +1215,4 @@ template class PackVmlinuxBase<ElfClass_LE32>;
 template class PackVmlinuxBase<ElfClass_BE32>;
 template class PackVmlinuxBase<ElfClass_LE64>;
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_vmlinx.h b/src/p_vmlinx.h
index 555512ab..acc7841a 100644
--- a/src/p_vmlinx.h
+++ b/src/p_vmlinx.h
@@ -243,8 +243,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_vmlinz.cpp b/src/p_vmlinz.cpp
index a5625a0a..0e46faa5 100644
--- a/src/p_vmlinz.cpp
+++ b/src/p_vmlinz.cpp
@@ -1068,8 +1068,4 @@ void PackVmlinuzARMEL::unpack(OutputFile *fo)
     }
 }
 
-/*
-vi:ts=4:et
-*/
-
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_vmlinz.h b/src/p_vmlinz.h
index 8fe4dc32..6f16c9c4 100644
--- a/src/p_vmlinz.h
+++ b/src/p_vmlinz.h
@@ -197,8 +197,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_vxd.h b/src/p_vxd.h
index 96620e1d..1d927079 100644
--- a/src/p_vxd.h
+++ b/src/p_vxd.h
@@ -66,8 +66,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_w16ne.cpp b/src/p_w16ne.cpp
index a55e8d1c..3d04837a 100644
--- a/src/p_w16ne.cpp
+++ b/src/p_w16ne.cpp
@@ -131,8 +131,4 @@ void PackW16Ne::unpack(OutputFile *)
     throwCantUnpack("not yet implemented");
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_w16ne.h b/src/p_w16ne.h
index 7d4e3d50..22918c44 100644
--- a/src/p_w16ne.h
+++ b/src/p_w16ne.h
@@ -63,8 +63,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_w32pe.cpp b/src/p_w32pe.cpp
index 8b09886f..130fb26b 100644
--- a/src/p_w32pe.cpp
+++ b/src/p_w32pe.cpp
@@ -292,7 +292,4 @@ void PackW32Pe::pack(OutputFile *fo)
     super::pack0(fo, 0x0c, 0x400000, false);
 }
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_w32pe.h b/src/p_w32pe.h
index 7061edac..15ed09ca 100644
--- a/src/p_w32pe.h
+++ b/src/p_w32pe.h
@@ -68,7 +68,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_w64pep.cpp b/src/p_w64pep.cpp
index 6341ba42..c72f7690 100644
--- a/src/p_w64pep.cpp
+++ b/src/p_w64pep.cpp
@@ -278,7 +278,4 @@ void PackW64Pep::pack(OutputFile *fo)
     super::pack0(fo, 0x0c, 0x0000000140000000ULL);
 }
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_w64pep.h b/src/p_w64pep.h
index 4817a7a8..0e821c69 100644
--- a/src/p_w64pep.h
+++ b/src/p_w64pep.h
@@ -64,7 +64,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_wcle.cpp b/src/p_wcle.cpp
index d2d0c310..d7d4f93e 100644
--- a/src/p_wcle.cpp
+++ b/src/p_wcle.cpp
@@ -857,8 +857,4 @@ void PackWcle::unpack(OutputFile *fo)
     copyOverlay(fo, overlay, &oimage);
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/p_wcle.h b/src/p_wcle.h
index fa9746e4..4e518e75 100644
--- a/src/p_wcle.h
+++ b/src/p_wcle.h
@@ -90,8 +90,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/packer.cpp b/src/packer.cpp
index 4ec13992..8da658b5 100644
--- a/src/packer.cpp
+++ b/src/packer.cpp
@@ -1593,8 +1593,4 @@ void Packer::compressWithFilters(Filter *ft,
     ibuf.checkState(); obuf.checkState();
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/packer.h b/src/packer.h
index 6e94b526..b64a668d 100644
--- a/src/packer.h
+++ b/src/packer.h
@@ -332,8 +332,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/packer_c.cpp b/src/packer_c.cpp
index 17ec3448..8fb117ee 100644
--- a/src/packer_c.cpp
+++ b/src/packer_c.cpp
@@ -296,8 +296,4 @@ void Packer::defineDecompressorSymbols()
     }
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/packer_f.cpp b/src/packer_f.cpp
index 1f27935f..6e7061ef 100644
--- a/src/packer_f.cpp
+++ b/src/packer_f.cpp
@@ -357,8 +357,4 @@ void Packer::defineFilterSymbols(const Filter *ft)
 #endif
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/packmast.cpp b/src/packmast.cpp
index d1a94b24..edf8e94f 100644
--- a/src/packmast.cpp
+++ b/src/packmast.cpp
@@ -422,8 +422,4 @@ void PackMaster::fileInfo()
     p->doFileInfo();
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/packmast.h b/src/packmast.h
index 41aad9f1..bc5f5b38 100644
--- a/src/packmast.h
+++ b/src/packmast.h
@@ -68,8 +68,4 @@ private:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/pefile.cpp b/src/pefile.cpp
index 9fb1e82c..e949ccc9 100644
--- a/src/pefile.cpp
+++ b/src/pefile.cpp
@@ -3102,7 +3102,4 @@ void PeFile64::processTls(Reloc *r, const Interval *iv, unsigned a)
 */
 
 
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/pefile.h b/src/pefile.h
index 3cf708a1..6159d833 100644
--- a/src/pefile.h
+++ b/src/pefile.h
@@ -538,7 +538,4 @@ protected:
 
 #endif /* already included */
 
-
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/s_djgpp2.cpp b/src/s_djgpp2.cpp
index 5756eb98..be43a804 100644
--- a/src/s_djgpp2.cpp
+++ b/src/s_djgpp2.cpp
@@ -434,6 +434,4 @@ screen_t *screen_djgpp2_construct(void) { return sobject_construct(&driver, size
 
 #endif /* (USE_SCREEN) && defined(__DJGPP__) */
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/s_object.cpp b/src/s_object.cpp
index da407914..2d3df191 100644
--- a/src/s_object.cpp
+++ b/src/s_object.cpp
@@ -82,6 +82,4 @@ screen_t *sobject_construct(const screen_t *c, size_t data_size) {
 
 #endif /* (USE_SCREEN) */
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/s_vcsa.cpp b/src/s_vcsa.cpp
index 9083bd9e..3a9e89cb 100644
--- a/src/s_vcsa.cpp
+++ b/src/s_vcsa.cpp
@@ -491,6 +491,4 @@ screen_t *screen_vcsa_construct(void) { return sobject_construct(&driver, sizeof
 
 #endif /* (USE_SCREEN) && (USE_SCREEN_VCSA) */
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/s_win32.cpp b/src/s_win32.cpp
index 6160a4b1..76ff8806 100644
--- a/src/s_win32.cpp
+++ b/src/s_win32.cpp
@@ -412,6 +412,4 @@ screen_t *screen_win32_construct(void) { return sobject_construct(&driver, sizeo
 
 #endif /* (USE_SCREEN_WIN32) */
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/screen.h b/src/screen.h
index 2cb70697..bca43972 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -101,6 +101,4 @@ void screen_show_frames(screen_t *);
 
 #endif /* already included */
 
-/*
-vi:ts=4:et
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/snprintf.h b/src/snprintf.h
index e99d05d2..62cdfad5 100644
--- a/src/snprintf.h
+++ b/src/snprintf.h
@@ -55,6 +55,4 @@ size_t upx_strlen(const char *);
 
 #endif /* already included */
 
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stdcxx.cpp b/src/stdcxx.cpp
index 8a6882b8..1e764031 100644
--- a/src/stdcxx.cpp
+++ b/src/stdcxx.cpp
@@ -43,6 +43,4 @@ char *__cxa_demangle(const char *mangled_name, char *buf, size_t *n, int *status
 } /* extern "C" */
 #endif
 
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stdcxx.h b/src/stdcxx.h
index e16bc449..3c69e782 100644
--- a/src/stdcxx.h
+++ b/src/stdcxx.h
@@ -53,6 +53,4 @@
 
 #endif /* already included */
 
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/amd64-darwin.dylib-entry.S b/src/stub/src/amd64-darwin.dylib-entry.S
index 96246590..0b71ee36 100644
--- a/src/stub/src/amd64-darwin.dylib-entry.S
+++ b/src/stub/src/amd64-darwin.dylib-entry.S
@@ -321,6 +321,4 @@ f_unfilter:
 
 dy_top:
 
-
-
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/amd64-darwin.macho-entry.S b/src/stub/src/amd64-darwin.macho-entry.S
index 0dfde7c0..2572f97a 100644
--- a/src/stub/src/amd64-darwin.macho-entry.S
+++ b/src/stub/src/amd64-darwin.macho-entry.S
@@ -225,4 +225,4 @@ main:
         call unfold
             // compressed fold_elf86 follows
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/amd64-darwin.macho-fold.S b/src/stub/src/amd64-darwin.macho-fold.S
index ea1e4829..9c1e328e 100644
--- a/src/stub/src/amd64-darwin.macho-fold.S
+++ b/src/stub/src/amd64-darwin.macho-fold.S
@@ -113,7 +113,4 @@ read: .globl read
 0:
         ret
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/amd64-darwin.macho-main.c b/src/stub/src/amd64-darwin.macho-main.c
index 0083aef1..2b13c6f2 100644
--- a/src/stub/src/amd64-darwin.macho-main.c
+++ b/src/stub/src/amd64-darwin.macho-main.c
@@ -642,8 +642,4 @@ ERR_LAB
     return entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/amd64-darwin.macho-upxmain.c b/src/stub/src/amd64-darwin.macho-upxmain.c
index 91dced9a..421d93ad 100644
--- a/src/stub/src/amd64-darwin.macho-upxmain.c
+++ b/src/stub/src/amd64-darwin.macho-upxmain.c
@@ -749,6 +749,4 @@ main(int argc, char *argv[])
     return 0;
 }
 
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/amd64-darwin.macho-upxsubr.S b/src/stub/src/amd64-darwin.macho-upxsubr.S
index 8b41c0a8..bbd8fbd3 100644
--- a/src/stub/src/amd64-darwin.macho-upxsubr.S
+++ b/src/stub/src/amd64-darwin.macho-upxsubr.S
@@ -88,3 +88,5 @@ GLOBAL(read)
         or $~0,%rax  //mov errno,eax
 0:
         ret
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/amd64-linux.elf-entry.S b/src/stub/src/amd64-linux.elf-entry.S
index f0b941ef..6be8ddc5 100644
--- a/src/stub/src/amd64-linux.elf-entry.S
+++ b/src/stub/src/amd64-linux.elf-entry.S
@@ -309,7 +309,4 @@ main:
 
 /*__XTHEENDX__*/
 
-/*
-vi:ts=8:et:nowrap
- */
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/amd64-linux.elf-fold.S b/src/stub/src/amd64-linux.elf-fold.S
index eab4410e..85a61d04 100644
--- a/src/stub/src/amd64-linux.elf-fold.S
+++ b/src/stub/src/amd64-linux.elf-fold.S
@@ -149,4 +149,4 @@ close: .globl close
 exit: .globl exit
         movb $ __NR_exit,%al; jmp sysgo
 
-# vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/amd64-linux.elf-main.c b/src/stub/src/amd64-linux.elf-main.c
index eaa2a44d..397dfa69 100644
--- a/src/stub/src/amd64-linux.elf-main.c
+++ b/src/stub/src/amd64-linux.elf-main.c
@@ -366,8 +366,4 @@ ERR_LAB
     return (void *)entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/amd64-linux.kernel.vmlinux-head.S b/src/stub/src/amd64-linux.kernel.vmlinux-head.S
index e0ff8478..3ed0948a 100644
--- a/src/stub/src/amd64-linux.kernel.vmlinux-head.S
+++ b/src/stub/src/amd64-linux.kernel.vmlinux-head.S
@@ -1,3 +1,3 @@
 #include "i386-linux.kernel.vmlinux-head.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/amd64-linux.kernel.vmlinux.S b/src/stub/src/amd64-linux.kernel.vmlinux.S
index 4e10828c..d885c287 100644
--- a/src/stub/src/amd64-linux.kernel.vmlinux.S
+++ b/src/stub/src/amd64-linux.kernel.vmlinux.S
@@ -1,3 +1,3 @@
 #include "i386-linux.kernel.vmlinux.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/amd64-linux.shlib-init.S b/src/stub/src/amd64-linux.shlib-init.S
index c80c0c68..abe8f2c2 100644
--- a/src/stub/src/amd64-linux.shlib-init.S
+++ b/src/stub/src/amd64-linux.shlib-init.S
@@ -411,7 +411,4 @@ L220:
 
 /*__XTHEENDX__*/
 
-/*
-vi:ts=8:et:nowrap
- */
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/amd64-win64.pep.S b/src/stub/src/amd64-win64.pep.S
index f7984083..451abf02 100644
--- a/src/stub/src/amd64-win64.pep.S
+++ b/src/stub/src/amd64-win64.pep.S
@@ -504,4 +504,4 @@ done_callbacks:
 
 #include        "include/header.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v4a-linux.elf-entry.S b/src/stub/src/arm.v4a-linux.elf-entry.S
index 20f56364..6d61b5cd 100644
--- a/src/stub/src/arm.v4a-linux.elf-entry.S
+++ b/src/stub/src/arm.v4a-linux.elf-entry.S
@@ -265,7 +265,4 @@ L71:
 cpr0: .globl cpr0
         /* { b_info={sz_unc, sz_cpr, {4 char}}, folded_loader...} */
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v4a-linux.elf-fold.S b/src/stub/src/arm.v4a-linux.elf-fold.S
index 7cb046a7..01b9167d 100644
--- a/src/stub/src/arm.v4a-linux.elf-fold.S
+++ b/src/stub/src/arm.v4a-linux.elf-fold.S
@@ -447,5 +447,4 @@ div10: .globl div10
 
 #endif  /*}*/
 
-@ vi:ts=8:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v4a-linux.elf-main.c b/src/stub/src/arm.v4a-linux.elf-main.c
index 5f0b0433..cdee9ecf 100644
--- a/src/stub/src/arm.v4a-linux.elf-main.c
+++ b/src/stub/src/arm.v4a-linux.elf-main.c
@@ -1 +1,3 @@
 #include "i386-linux.elf-main.c"
+
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/arm.v4a-linux.shlib-init.S b/src/stub/src/arm.v4a-linux.shlib-init.S
index 60c3ef4e..7f5df25c 100644
--- a/src/stub/src/arm.v4a-linux.shlib-init.S
+++ b/src/stub/src/arm.v4a-linux.shlib-init.S
@@ -428,6 +428,5 @@ wlen_subr:  // edx+= nwords of inline subr at *tmp
         ret
 
 /*__XTHEENDX__*/
-/*
-vi:ts=8:et:nowrap
-*/
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v4a-wince.pe.S b/src/stub/src/arm.v4a-wince.pe.S
index 950cc028..cf4d112f 100644
--- a/src/stub/src/arm.v4a-wince.pe.S
+++ b/src/stub/src/arm.v4a-wince.pe.S
@@ -413,3 +413,4 @@ section LZMA_DEC10
 
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v4t-linux.shlib-init.S b/src/stub/src/arm.v4t-linux.shlib-init.S
index 3b7c1098..d0860b27 100644
--- a/src/stub/src/arm.v4t-linux.shlib-init.S
+++ b/src/stub/src/arm.v4t-linux.shlib-init.S
@@ -499,6 +499,5 @@ wlen_subr:  // Out: ecx= nwords of inline subr at *tmp
         ret
 
 /*__XTHEENDX__*/
-/*
-vi:ts=8:et:nowrap
-*/
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v4t-wince.pe.S b/src/stub/src/arm.v4t-wince.pe.S
index d2b926d0..2369f602 100644
--- a/src/stub/src/arm.v4t-wince.pe.S
+++ b/src/stub/src/arm.v4t-wince.pe.S
@@ -366,3 +366,4 @@ section LZMA_DECODE
 section LZMA_DEC10
 #include "arch/arm/v4t/lzma_d_cs.S"
 
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v5a-darwin.macho-entry.S b/src/stub/src/arm.v5a-darwin.macho-entry.S
index e78a19df..42b15230 100644
--- a/src/stub/src/arm.v5a-darwin.macho-entry.S
+++ b/src/stub/src/arm.v5a-darwin.macho-entry.S
@@ -134,8 +134,4 @@ L100:
 GAP= 128  // > farthest prefetch;               must match ../../p_mach.cpp
 NO_LAP= 64  // avoid overlap for folded loader; must match ../../p_mach.cpp
 
-/*
-vi:ts=8:et:nowrap
-*/
-
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v5a-darwin.macho-fold.S b/src/stub/src/arm.v5a-darwin.macho-fold.S
index 96b3ee06..e0c81a49 100644
--- a/src/stub/src/arm.v5a-darwin.macho-fold.S
+++ b/src/stub/src/arm.v5a-darwin.macho-fold.S
@@ -228,5 +228,4 @@ bswap9:
         bge bswap0
         ret
 
-// vi:ts=8:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v5a-darwin.macho-main.c b/src/stub/src/arm.v5a-darwin.macho-main.c
index c90bb6d9..4854f44e 100644
--- a/src/stub/src/arm.v5a-darwin.macho-main.c
+++ b/src/stub/src/arm.v5a-darwin.macho-main.c
@@ -455,8 +455,4 @@ ERR_LAB
     return entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/arm.v5a-linux.elf-entry.S b/src/stub/src/arm.v5a-linux.elf-entry.S
index ef87028b..9a2061ec 100644
--- a/src/stub/src/arm.v5a-linux.elf-entry.S
+++ b/src/stub/src/arm.v5a-linux.elf-entry.S
@@ -1,2 +1,4 @@
 #define ARMEL_EABI4 1
 #include "arm.v4a-linux.elf-entry.S"
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v5a-linux.elf-fold.S b/src/stub/src/arm.v5a-linux.elf-fold.S
index dd57c756..7449a174 100644
--- a/src/stub/src/arm.v5a-linux.elf-fold.S
+++ b/src/stub/src/arm.v5a-linux.elf-fold.S
@@ -1,2 +1,4 @@
 #define ARMEL_EABI4 1
 #include "arm.v4a-linux.elf-fold.S"
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v5a-linux.kernel.vmlinux-head.S b/src/stub/src/arm.v5a-linux.kernel.vmlinux-head.S
index b3b9c6bf..1dd9899a 100644
--- a/src/stub/src/arm.v5a-linux.kernel.vmlinux-head.S
+++ b/src/stub/src/arm.v5a-linux.kernel.vmlinux-head.S
@@ -29,4 +29,4 @@
         bl LINUX000  // lr= PIC location of compressed data
 // Compressed data appears >here<, then decompressor.
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v5a-linux.kernel.vmlinux.S b/src/stub/src/arm.v5a-linux.kernel.vmlinux.S
index f99799b2..aab7a80f 100644
--- a/src/stub/src/arm.v5a-linux.kernel.vmlinux.S
+++ b/src/stub/src/arm.v5a-linux.kernel.vmlinux.S
@@ -158,4 +158,4 @@ section NRV2E
 
 #include "include/header.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v5a-linux.kernel.vmlinuz-head.S b/src/stub/src/arm.v5a-linux.kernel.vmlinuz-head.S
index f1889e4c..721dea0c 100644
--- a/src/stub/src/arm.v5a-linux.kernel.vmlinuz-head.S
+++ b/src/stub/src/arm.v5a-linux.kernel.vmlinuz-head.S
@@ -2,3 +2,5 @@
  * is same as   arm-linux.kernel.vmlinux-head.S
  */
 #include "arm.v5a-linux.kernel.vmlinux-head.S"
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v5a-linux.kernel.vmlinuz.S b/src/stub/src/arm.v5a-linux.kernel.vmlinuz.S
index 7eb8a36e..bf27d9ac 100644
--- a/src/stub/src/arm.v5a-linux.kernel.vmlinuz.S
+++ b/src/stub/src/arm.v5a-linux.kernel.vmlinuz.S
@@ -4,3 +4,5 @@
  *    #include "stub/arm.v5a-linux.kernel.vmlinux.h"
  */
 #include "arm.v5a-linux.kernel.vmlinux.S"
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v5a-linux.shlib-init.S b/src/stub/src/arm.v5a-linux.shlib-init.S
index 60856fd5..129a332a 100644
--- a/src/stub/src/arm.v5a-linux.shlib-init.S
+++ b/src/stub/src/arm.v5a-linux.shlib-init.S
@@ -1,2 +1,4 @@
 #define ARMEL_EABI4 1
 #include "arm.v4a-linux.shlib-init.S"
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm.v5t-linux.shlib-init.S b/src/stub/src/arm.v5t-linux.shlib-init.S
index 5b29103a..1b4a3c2d 100644
--- a/src/stub/src/arm.v5t-linux.shlib-init.S
+++ b/src/stub/src/arm.v5t-linux.shlib-init.S
@@ -1,2 +1,4 @@
 #define ARMEL_EABI4 1
 #include "arm.v4t-linux.shlib-init.S"
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm64-darwin.macho-entry.S b/src/stub/src/arm64-darwin.macho-entry.S
index b84eee61..b4a54c8b 100644
--- a/src/stub/src/arm64-darwin.macho-entry.S
+++ b/src/stub/src/arm64-darwin.macho-entry.S
@@ -152,8 +152,4 @@ NO_LAP= 64  // avoid overlap for folded loader; must match ../../p_mach.cpp
 #undef ldstx
 #undef ldst
 
-/*
-vi:ts=8:et:nowrap
-*/
-
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm64-darwin.macho-fold.S b/src/stub/src/arm64-darwin.macho-fold.S
index 3c3c3b3e..c6028fa9 100644
--- a/src/stub/src/arm64-darwin.macho-fold.S
+++ b/src/stub/src/arm64-darwin.macho-fold.S
@@ -209,5 +209,4 @@ bswap9:
         bge bswap0
         ret
 
-// vi:ts=8:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/arm64-darwin.macho-main.c b/src/stub/src/arm64-darwin.macho-main.c
index 7d102eef..e3c460ba 100644
--- a/src/stub/src/arm64-darwin.macho-main.c
+++ b/src/stub/src/arm64-darwin.macho-main.c
@@ -461,8 +461,4 @@ ERR_LAB
     return entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/armeb.v4a-linux.elf-entry.S b/src/stub/src/armeb.v4a-linux.elf-entry.S
index 160b9b20..7852f3e0 100644
--- a/src/stub/src/armeb.v4a-linux.elf-entry.S
+++ b/src/stub/src/armeb.v4a-linux.elf-entry.S
@@ -1,2 +1,4 @@
 #define ARM_OLDABI 1
 #include "arm.v4a-linux.elf-entry.S"
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/armeb.v4a-linux.elf-fold.S b/src/stub/src/armeb.v4a-linux.elf-fold.S
index e39a972f..7e474db3 100644
--- a/src/stub/src/armeb.v4a-linux.elf-fold.S
+++ b/src/stub/src/armeb.v4a-linux.elf-fold.S
@@ -32,4 +32,4 @@
 #include "arm.v4a-linux.elf-fold.S"
 #undef FILTER_ID
 
-@ vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/armeb.v4a-linux.elf-main.c b/src/stub/src/armeb.v4a-linux.elf-main.c
index 5f0b0433..cdee9ecf 100644
--- a/src/stub/src/armeb.v4a-linux.elf-main.c
+++ b/src/stub/src/armeb.v4a-linux.elf-main.c
@@ -1 +1,3 @@
 #include "i386-linux.elf-main.c"
+
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/armeb.v5a-linux.kernel.vmlinux-head.S b/src/stub/src/armeb.v5a-linux.kernel.vmlinux-head.S
index b8bef640..93feef6d 100644
--- a/src/stub/src/armeb.v5a-linux.kernel.vmlinux-head.S
+++ b/src/stub/src/armeb.v5a-linux.kernel.vmlinux-head.S
@@ -27,4 +27,4 @@
 
 #include "arm.v5a-linux.kernel.vmlinux-head.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/armeb.v5a-linux.kernel.vmlinux.S b/src/stub/src/armeb.v5a-linux.kernel.vmlinux.S
index 7084b4fc..d4b12ecd 100644
--- a/src/stub/src/armeb.v5a-linux.kernel.vmlinux.S
+++ b/src/stub/src/armeb.v5a-linux.kernel.vmlinux.S
@@ -32,4 +32,4 @@
 
 #include "arm.v5a-linux.kernel.vmlinux.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/armel-linux.elf-main.c b/src/stub/src/armel-linux.elf-main.c
index 5f0b0433..cdee9ecf 100644
--- a/src/stub/src/armel-linux.elf-main.c
+++ b/src/stub/src/armel-linux.elf-main.c
@@ -1 +1,3 @@
 #include "i386-linux.elf-main.c"
+
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/c/lzma_d_c.c b/src/stub/src/c/lzma_d_c.c
index 2c6c7f2f..c074c08a 100644
--- a/src/stub/src/c/lzma_d_c.c
+++ b/src/stub/src/c/lzma_d_c.c
@@ -111,8 +111,4 @@ int LzmaDecode(CLzmaDecoderState *, const unsigned char *, SizeT, SizeT *, unsig
 
 #endif
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/i086-dos16.com.S b/src/stub/src/i086-dos16.com.S
index e07a0bd4..1c8dcbb4 100644
--- a/src/stub/src/i086-dos16.com.S
+++ b/src/stub/src/i086-dos16.com.S
@@ -72,6 +72,5 @@ section         COMCUTPO
 
 section         CORETURN
                 ret
-/*
-; vi:ts=8:et:nowrap
-*/
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i086-dos16.exe.S b/src/stub/src/i086-dos16.exe.S
index 6d3b2f06..91b2bb7e 100644
--- a/src/stub/src/i086-dos16.exe.S
+++ b/src/stub/src/i086-dos16.exe.S
@@ -246,7 +246,4 @@ section         EXERETIP
                 push    ax
                 lret
 
-
-/*
-vi:ts=8:et:nowrap
-*/
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i086-dos16.sys.S b/src/stub/src/i086-dos16.sys.S
index 5d542597..40e0814b 100644
--- a/src/stub/src/i086-dos16.sys.S
+++ b/src/stub/src/i086-dos16.sys.S
@@ -107,6 +107,4 @@ section         SYSI0862
 section         SYSJUMP1
                 jmp     original_strategy
 
-/*
-; vi:ts=8:et:nowrap
-*/
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-bsd.elf-entry.S b/src/stub/src/i386-bsd.elf-entry.S
index 7c7dd7d2..05dccf1c 100644
--- a/src/stub/src/i386-bsd.elf-entry.S
+++ b/src/stub/src/i386-bsd.elf-entry.S
@@ -227,5 +227,4 @@ main:
             // compressed fold_elf86 follows
 eof:
 
-// vi:ts=8:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-bsd.elf-fold.S b/src/stub/src/i386-bsd.elf-fold.S
index 938e38ea..b561d9b3 100644
--- a/src/stub/src/i386-bsd.elf-fold.S
+++ b/src/stub/src/i386-bsd.elf-fold.S
@@ -203,5 +203,5 @@ L32:
         ret
 
 .balign 4,0
-// vi:ts=8:et:nowrap
 
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-bsd.elf-main.c b/src/stub/src/i386-bsd.elf-main.c
index 9e86aea1..ce27b67e 100644
--- a/src/stub/src/i386-bsd.elf-main.c
+++ b/src/stub/src/i386-bsd.elf-main.c
@@ -590,8 +590,4 @@ ERR_LAB
     return (void *)entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/i386-bsd.elf.execve-entry.S b/src/stub/src/i386-bsd.elf.execve-entry.S
index b8f7644f..a859dfd7 100644
--- a/src/stub/src/i386-bsd.elf.execve-entry.S
+++ b/src/stub/src/i386-bsd.elf.execve-entry.S
@@ -149,5 +149,4 @@ main:
 
 eof:
 
-// vi:ts=8:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-bsd.elf.execve-fold.S b/src/stub/src/i386-bsd.elf.execve-fold.S
index a53e7724..9f5bc7d6 100644
--- a/src/stub/src/i386-bsd.elf.execve-fold.S
+++ b/src/stub/src/i386-bsd.elf.execve-fold.S
@@ -57,4 +57,5 @@ fold_begin:  // enter: %ebx= &Elf32_Ehdr of this program
                 hlt                         // Crash if somehow upx_main does return
 
 .balign 4,0
-// vi:ts=8:et:nowrap
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-bsd.elf.execve-main.c b/src/stub/src/i386-bsd.elf.execve-main.c
index 5fb6ffe2..48adca5c 100644
--- a/src/stub/src/i386-bsd.elf.execve-main.c
+++ b/src/stub/src/i386-bsd.elf.execve-main.c
@@ -514,7 +514,4 @@ void upx_main(
     goto error;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/i386-bsd.syscall.S b/src/stub/src/i386-bsd.syscall.S
index b348e4d7..654ed120 100644
--- a/src/stub/src/i386-bsd.syscall.S
+++ b/src/stub/src/i386-bsd.syscall.S
@@ -104,5 +104,4 @@ SYS(nanosleep)
 SYS(unlink)
 SYS(waitpid)
 
-// vi:ts=8:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-darwin.dylib-entry.S b/src/stub/src/i386-darwin.dylib-entry.S
index 42bfd694..46d28144 100644
--- a/src/stub/src/i386-darwin.dylib-entry.S
+++ b/src/stub/src/i386-darwin.dylib-entry.S
@@ -239,4 +239,4 @@ sysgo:
 
 dy_top:
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-darwin.macho-entry.S b/src/stub/src/i386-darwin.macho-entry.S
index a61f8903..4de378d8 100644
--- a/src/stub/src/i386-darwin.macho-entry.S
+++ b/src/stub/src/i386-darwin.macho-entry.S
@@ -171,4 +171,4 @@ main:
         call unfold
             // compressed fold_elf86 follows
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-darwin.macho-fold.S b/src/stub/src/i386-darwin.macho-fold.S
index ef7f8af8..d4203e28 100644
--- a/src/stub/src/i386-darwin.macho-fold.S
+++ b/src/stub/src/i386-darwin.macho-fold.S
@@ -136,7 +136,5 @@ read: .globl read
         ret
 
 .balign 2,144
-/*
-vi:ts=8:et:nowrap
-*/
 
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-darwin.macho-main.c b/src/stub/src/i386-darwin.macho-main.c
index 1685010e..51ef82da 100644
--- a/src/stub/src/i386-darwin.macho-main.c
+++ b/src/stub/src/i386-darwin.macho-main.c
@@ -632,8 +632,4 @@ ERR_LAB
     return entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/i386-dos32.djgpp2.S b/src/stub/src/i386-dos32.djgpp2.S
index 009ced1c..93a977ca 100644
--- a/src/stub/src/i386-dos32.djgpp2.S
+++ b/src/stub/src/i386-dos32.djgpp2.S
@@ -97,4 +97,4 @@ section DJRETURN
 
 #include        "include/header.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-dos32.tmt.S b/src/stub/src/i386-dos32.tmt.S
index d03b9483..b9a21b68 100644
--- a/src/stub/src/i386-dos32.tmt.S
+++ b/src/stub/src/i386-dos32.tmt.S
@@ -101,4 +101,4 @@ section         TMTRELOC
 section         TMTJUMP1
                 jmp     original_entry
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-dos32.watcom.le.S b/src/stub/src/i386-dos32.watcom.le.S
index 810a4201..7eddaae4 100644
--- a/src/stub/src/i386-dos32.watcom.le.S
+++ b/src/stub/src/i386-dos32.watcom.le.S
@@ -124,4 +124,4 @@ section WCLEMAI4
 
                 jmp     original_entry
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.elf-entry.S b/src/stub/src/i386-linux.elf-entry.S
index 67ab8796..c9bd8507 100644
--- a/src/stub/src/i386-linux.elf-entry.S
+++ b/src/stub/src/i386-linux.elf-entry.S
@@ -260,5 +260,4 @@ main:
             // compressed fold_elf86 follows
 eof:
 
-// vi:ts=8:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.elf-fold.S b/src/stub/src/i386-linux.elf-fold.S
index d1fea438..7e5f8762 100644
--- a/src/stub/src/i386-linux.elf-fold.S
+++ b/src/stub/src/i386-linux.elf-fold.S
@@ -258,5 +258,5 @@ mmap: .globl mmap
         ret
 
 .balign 4,0
-// vi:ts=8:et:nowrap
 
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.elf-main.c b/src/stub/src/i386-linux.elf-main.c
index efb9cc23..06a8d36f 100644
--- a/src/stub/src/i386-linux.elf-main.c
+++ b/src/stub/src/i386-linux.elf-main.c
@@ -842,7 +842,4 @@ ERR_LAB
     return (void *)entry;
 }
 
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/i386-linux.elf.execve-entry.S b/src/stub/src/i386-linux.elf.execve-entry.S
index 63cdf6ce..0f848917 100644
--- a/src/stub/src/i386-linux.elf.execve-entry.S
+++ b/src/stub/src/i386-linux.elf.execve-entry.S
@@ -156,5 +156,4 @@ main:
 
 eof:
 
-// vi:ts=8:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.elf.execve-fold.S b/src/stub/src/i386-linux.elf.execve-fold.S
index 0b7c09ef..7096c94c 100644
--- a/src/stub/src/i386-linux.elf.execve-fold.S
+++ b/src/stub/src/i386-linux.elf.execve-fold.S
@@ -69,4 +69,5 @@ mmap: .globl mmap
         ret
 
 .balign 4,0
-// vi:ts=8:et:nowrap
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.elf.execve-main.c b/src/stub/src/i386-linux.elf.execve-main.c
index 1c6f4df6..d8f42c6d 100644
--- a/src/stub/src/i386-linux.elf.execve-main.c
+++ b/src/stub/src/i386-linux.elf.execve-main.c
@@ -537,7 +537,4 @@ void upx_main(
     goto error;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/i386-linux.elf.execve-upx_itoa.S b/src/stub/src/i386-linux.elf.execve-upx_itoa.S
index 4554bc29..b518d8d9 100644
--- a/src/stub/src/i386-linux.elf.execve-upx_itoa.S
+++ b/src/stub/src/i386-linux.elf.execve-upx_itoa.S
@@ -1,2 +1,4 @@
 #include "arch/i386/macros.S"
 #include "arch/i386/upx_itoa.S"
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.elf.interp-entry.S b/src/stub/src/i386-linux.elf.interp-entry.S
index 97001d34..8144b1bd 100644
--- a/src/stub/src/i386-linux.elf.interp-entry.S
+++ b/src/stub/src/i386-linux.elf.interp-entry.S
@@ -178,5 +178,4 @@ L300:
 
 eof:
 
-// vi:ts=8:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.elf.interp-fold.S b/src/stub/src/i386-linux.elf.interp-fold.S
index 619fd1b5..a6848437 100644
--- a/src/stub/src/i386-linux.elf.interp-fold.S
+++ b/src/stub/src/i386-linux.elf.interp-fold.S
@@ -126,5 +126,5 @@ mmap: .globl mmap
         ret
 
 .balign 4,0
-// vi:ts=8:et:nowrap
 
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.elf.interp-main.c b/src/stub/src/i386-linux.elf.interp-main.c
index 5b6c5cb2..404fc79b 100644
--- a/src/stub/src/i386-linux.elf.interp-main.c
+++ b/src/stub/src/i386-linux.elf.interp-main.c
@@ -422,8 +422,4 @@ ERR_LAB
     return (void *)entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/i386-linux.elf.shell-entry.S b/src/stub/src/i386-linux.elf.shell-entry.S
index 87a758a1..5760e8c2 100644
--- a/src/stub/src/i386-linux.elf.shell-entry.S
+++ b/src/stub/src/i386-linux.elf.shell-entry.S
@@ -158,5 +158,4 @@ main:
 
 eof:
 
-// vi:ts=8:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.elf.shell-fold.S b/src/stub/src/i386-linux.elf.shell-fold.S
index 54556a6c..5e3bba3d 100644
--- a/src/stub/src/i386-linux.elf.shell-fold.S
+++ b/src/stub/src/i386-linux.elf.shell-fold.S
@@ -173,5 +173,5 @@ mmap: .globl mmap
 
 
 .balign 4,0
-// vi:ts=8:et:nowrap
 
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.elf.shell-main.c b/src/stub/src/i386-linux.elf.shell-main.c
index 244ed211..2ecaf5c0 100644
--- a/src/stub/src/i386-linux.elf.shell-main.c
+++ b/src/stub/src/i386-linux.elf.shell-main.c
@@ -351,8 +351,4 @@ void *upx_main(
     return (void *)entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/i386-linux.kernel.vmlinux-head.S b/src/stub/src/i386-linux.kernel.vmlinux-head.S
index fb2a4a0d..aa2d32cd 100644
--- a/src/stub/src/i386-linux.kernel.vmlinux-head.S
+++ b/src/stub/src/i386-linux.kernel.vmlinux-head.S
@@ -63,4 +63,4 @@
         call COMPRESSED_LENGTH
 // Compressed data appears >here<, then decompressor.
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.kernel.vmlinux.S b/src/stub/src/i386-linux.kernel.vmlinux.S
index b2cd249c..bd8c2a2d 100644
--- a/src/stub/src/i386-linux.kernel.vmlinux.S
+++ b/src/stub/src/i386-linux.kernel.vmlinux.S
@@ -215,4 +215,4 @@ section         LINUX992
 
 #include "include/header.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.kernel.vmlinuz.S b/src/stub/src/i386-linux.kernel.vmlinuz.S
index b4a6119f..0b659ac7 100644
--- a/src/stub/src/i386-linux.kernel.vmlinuz.S
+++ b/src/stub/src/i386-linux.kernel.vmlinuz.S
@@ -464,4 +464,4 @@ section         LINUZ990
 
 #include        "include/header.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-linux.shlib-init.S b/src/stub/src/i386-linux.shlib-init.S
index 56346686..168761aa 100644
--- a/src/stub/src/i386-linux.shlib-init.S
+++ b/src/stub/src/i386-linux.shlib-init.S
@@ -325,5 +325,4 @@ section LUNMP001
 section LEXEC025
 section LEXECDYN
 
-// vi:ts=8:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-netbsd.elf-entry.S b/src/stub/src/i386-netbsd.elf-entry.S
index 6095bc06..5afa9ed1 100644
--- a/src/stub/src/i386-netbsd.elf-entry.S
+++ b/src/stub/src/i386-netbsd.elf-entry.S
@@ -1,2 +1,4 @@
 #define SYS_mmap 0xc5
 #include "i386-bsd.elf-entry.S"
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-openbsd.elf-fold.S b/src/stub/src/i386-openbsd.elf-fold.S
index f3132548..438a69ef 100644
--- a/src/stub/src/i386-openbsd.elf-fold.S
+++ b/src/stub/src/i386-openbsd.elf-fold.S
@@ -203,5 +203,5 @@ L32:
         ret
 
 .balign 4,0
-// vi:ts=8:et:nowrap
 
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/i386-openbsd.elf-main.c b/src/stub/src/i386-openbsd.elf-main.c
index 27862a99..84bba533 100644
--- a/src/stub/src/i386-openbsd.elf-main.c
+++ b/src/stub/src/i386-openbsd.elf-main.c
@@ -596,8 +596,4 @@ ERR_LAB
     return (void *)entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/i386-win32.pe.S b/src/stub/src/i386-win32.pe.S
index aecd49f1..91060b10 100644
--- a/src/stub/src/i386-win32.pe.S
+++ b/src/stub/src/i386-win32.pe.S
@@ -295,4 +295,4 @@ end_of_tls_handler:
 
 #include        "include/header.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/m68k-atari.tos.S b/src/stub/src/m68k-atari.tos.S
index 2864c02b..6fd4e6c3 100644
--- a/src/stub/src/m68k-atari.tos.S
+++ b/src/stub/src/m68k-atari.tos.S
@@ -651,6 +651,4 @@ N(lzma,small)
 
 #endif
 
-
-// vi:ts=4:et:nowrap
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/mips.r3000-linux.elf-entry.S b/src/stub/src/mips.r3000-linux.elf-entry.S
index aa48db4f..755e5275 100644
--- a/src/stub/src/mips.r3000-linux.elf-entry.S
+++ b/src/stub/src/mips.r3000-linux.elf-entry.S
@@ -1 +1,3 @@
 #include "mipsel.r3000-linux.elf-entry.S"
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/mips.r3000-linux.elf-fold.S b/src/stub/src/mips.r3000-linux.elf-fold.S
index 80e9ca86..1feec813 100644
--- a/src/stub/src/mips.r3000-linux.elf-fold.S
+++ b/src/stub/src/mips.r3000-linux.elf-fold.S
@@ -1 +1,3 @@
 #include "mipsel.r3000-linux.elf-fold.S"
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/mips.r3000-linux.elf-main.c b/src/stub/src/mips.r3000-linux.elf-main.c
index 5f0b0433..cdee9ecf 100644
--- a/src/stub/src/mips.r3000-linux.elf-main.c
+++ b/src/stub/src/mips.r3000-linux.elf-main.c
@@ -1 +1,3 @@
 #include "i386-linux.elf-main.c"
+
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/mipsel.r3000-linux.elf-entry.S b/src/stub/src/mipsel.r3000-linux.elf-entry.S
index e0472e9f..cda6f89f 100644
--- a/src/stub/src/mipsel.r3000-linux.elf-entry.S
+++ b/src/stub/src/mipsel.r3000-linux.elf-entry.S
@@ -341,7 +341,4 @@ main:
 
 /*__XTHEENDX__*/
 
-/*
-vi:ts=8:et:nowrap
- */
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/mipsel.r3000-linux.elf-fold.S b/src/stub/src/mipsel.r3000-linux.elf-fold.S
index ae77690a..fc86f357 100644
--- a/src/stub/src/mipsel.r3000-linux.elf-fold.S
+++ b/src/stub/src/mipsel.r3000-linux.elf-fold.S
@@ -217,4 +217,4 @@ mmap: .globl mmap
           addiu sp,sp, sp_frame
 #endif  /*}*/
 
-# vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/mipsel.r3000-linux.elf-main.c b/src/stub/src/mipsel.r3000-linux.elf-main.c
index 102abf87..cdee9ecf 100644
--- a/src/stub/src/mipsel.r3000-linux.elf-main.c
+++ b/src/stub/src/mipsel.r3000-linux.elf-main.c
@@ -1,2 +1,3 @@
 #include "i386-linux.elf-main.c"
 
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/mipsel.r3000-ps1.S b/src/stub/src/mipsel.r3000-ps1.S
index 1bb8966c..fbca619a 100644
--- a/src/stub/src/mipsel.r3000-ps1.S
+++ b/src/stub/src/mipsel.r3000-ps1.S
@@ -366,5 +366,4 @@ section     lzma.init
 
 #include    "include/header.S"
 
-
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc-darwin.dylib-entry.S b/src/stub/src/powerpc-darwin.dylib-entry.S
index 61dae9da..52a00190 100644
--- a/src/stub/src/powerpc-darwin.dylib-entry.S
+++ b/src/stub/src/powerpc-darwin.dylib-entry.S
@@ -277,7 +277,4 @@ main:
 dy_top:
 len_top  = dy_top - main
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc-darwin.macho-entry.S b/src/stub/src/powerpc-darwin.macho-entry.S
index d7c4ccd5..1d76e9b7 100644
--- a/src/stub/src/powerpc-darwin.macho-entry.S
+++ b/src/stub/src/powerpc-darwin.macho-entry.S
@@ -135,7 +135,4 @@ L100: GAP= 128  # > farthest_prefetch; must match ../p_mach.cpp
         b GAP+L100  # 'isync' has trouble on Macintosh G4?
         /* { b_info={sz_unc, sz_cpr, {4 char}}, folded_loader...} */
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc-darwin.macho-fold.S b/src/stub/src/powerpc-darwin.macho-fold.S
index 6c595d9a..b89fe6c2 100644
--- a/src/stub/src/powerpc-darwin.macho-fold.S
+++ b/src/stub/src/powerpc-darwin.macho-fold.S
@@ -130,7 +130,4 @@ close: .globl close
 mprotect: .globl mprotect
         li 0,SYS_mprotect; b sysgo
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc-darwin.macho-main.c b/src/stub/src/powerpc-darwin.macho-main.c
index d39bcef5..f426706d 100644
--- a/src/stub/src/powerpc-darwin.macho-main.c
+++ b/src/stub/src/powerpc-darwin.macho-main.c
@@ -453,8 +453,4 @@ ERR_LAB
     return entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/powerpc-linux.elf-entry.S b/src/stub/src/powerpc-linux.elf-entry.S
index 56ef8080..3a0986a7 100644
--- a/src/stub/src/powerpc-linux.elf-entry.S
+++ b/src/stub/src/powerpc-linux.elf-entry.S
@@ -190,7 +190,4 @@ main:
         call unfold
         /* { b_info={sz_unc, sz_cpr, {4 char}}, folded_loader...} */
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc-linux.elf-fold.S b/src/stub/src/powerpc-linux.elf-fold.S
index 29afd52b..298d2d39 100644
--- a/src/stub/src/powerpc-linux.elf-fold.S
+++ b/src/stub/src/powerpc-linux.elf-fold.S
@@ -133,7 +133,4 @@ munmap: .globl munmap
 brk: .globl brk
         li 0,SYS_brk; b sysgo
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc-linux.elf-main.c b/src/stub/src/powerpc-linux.elf-main.c
index 1687a882..793d971e 100644
--- a/src/stub/src/powerpc-linux.elf-main.c
+++ b/src/stub/src/powerpc-linux.elf-main.c
@@ -346,8 +346,4 @@ ERR_LAB
     return (void *)entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/powerpc-linux.kernel.vmlinux-head.S b/src/stub/src/powerpc-linux.kernel.vmlinux-head.S
index 16e65c7f..ad30f57b 100644
--- a/src/stub/src/powerpc-linux.kernel.vmlinux-head.S
+++ b/src/stub/src/powerpc-linux.kernel.vmlinux-head.S
@@ -28,4 +28,4 @@
         mflr 31
         bl LINUX000
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc-linux.kernel.vmlinux.S b/src/stub/src/powerpc-linux.kernel.vmlinux.S
index 3f29b445..4a93c21a 100644
--- a/src/stub/src/powerpc-linux.kernel.vmlinux.S
+++ b/src/stub/src/powerpc-linux.kernel.vmlinux.S
@@ -146,4 +146,4 @@ section LZMA
 
 #include "include/header.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc64-savegpr0.S b/src/stub/src/powerpc64-savegpr0.S
index 6e7fb5ac..ca9485ee 100644
--- a/src/stub/src/powerpc64-savegpr0.S
+++ b/src/stub/src/powerpc64-savegpr0.S
@@ -64,3 +64,5 @@ _restgpr0_29: .globl _restgpr0_29
         ldd r30,-8*(32-30)(r1)
         ldd r31,-8*(32-31)(r1)
          blr  # return to caller
+
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc64le-darwin.dylib-entry.S b/src/stub/src/powerpc64le-darwin.dylib-entry.S
index d9f31769..076688a5 100644
--- a/src/stub/src/powerpc64le-darwin.dylib-entry.S
+++ b/src/stub/src/powerpc64le-darwin.dylib-entry.S
@@ -348,7 +348,4 @@ main:
 dy_top:
 len_top  = dy_top - main
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc64le-darwin.macho-entry.S b/src/stub/src/powerpc64le-darwin.macho-entry.S
index 5cc1bb5b..b000380a 100644
--- a/src/stub/src/powerpc64le-darwin.macho-entry.S
+++ b/src/stub/src/powerpc64le-darwin.macho-entry.S
@@ -138,7 +138,4 @@ L100: GAP= 128  # > farthest_prefetch; must match ../p_mach.cpp
         b GAP+L100  # 'isync' has trouble on Macintosh G4?
         /* { b_info={sz_unc, sz_cpr, {4 char}}, folded_loader...} */
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc64le-darwin.macho-fold.S b/src/stub/src/powerpc64le-darwin.macho-fold.S
index c4c5fa67..274825d3 100644
--- a/src/stub/src/powerpc64le-darwin.macho-fold.S
+++ b/src/stub/src/powerpc64le-darwin.macho-fold.S
@@ -130,7 +130,4 @@ close: .globl close
 mprotect: .globl mprotect
         li 0,SYS_mprotect; b sysgo
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc64le-darwin.macho-main.c b/src/stub/src/powerpc64le-darwin.macho-main.c
index 32f5a1ef..cfed20f1 100644
--- a/src/stub/src/powerpc64le-darwin.macho-main.c
+++ b/src/stub/src/powerpc64le-darwin.macho-main.c
@@ -453,8 +453,4 @@ ERR_LAB
     return entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/powerpc64le-linux.elf-entry.S b/src/stub/src/powerpc64le-linux.elf-entry.S
index 381ce357..1031af5e 100644
--- a/src/stub/src/powerpc64le-linux.elf-entry.S
+++ b/src/stub/src/powerpc64le-linux.elf-entry.S
@@ -223,7 +223,4 @@ main:
         call unfold
         /* { b_info={sz_unc, sz_cpr, {4 char}}, folded_loader...} */
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc64le-linux.elf-fold.S b/src/stub/src/powerpc64le-linux.elf-fold.S
index 0d8103e1..824d7f1e 100644
--- a/src/stub/src/powerpc64le-linux.elf-fold.S
+++ b/src/stub/src/powerpc64le-linux.elf-fold.S
@@ -197,7 +197,4 @@ munmap: .globl munmap
 brk: .globl brk
         li 0,SYS_brk; b sysgo
 
-/*
-vi:ts=8:et:nowrap
-*/
-
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc64le-linux.elf-main.c b/src/stub/src/powerpc64le-linux.elf-main.c
index b08e4c99..1d5aa58a 100644
--- a/src/stub/src/powerpc64le-linux.elf-main.c
+++ b/src/stub/src/powerpc64le-linux.elf-main.c
@@ -348,8 +348,4 @@ ERR_LAB
     return (void *)entry;
 }
 
-
-/*
-vi:ts=4:et:nowrap
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/stub/src/powerpc64le-linux.kernel.vmlinux-head.S b/src/stub/src/powerpc64le-linux.kernel.vmlinux-head.S
index 6c48ca94..12c2eec7 100644
--- a/src/stub/src/powerpc64le-linux.kernel.vmlinux-head.S
+++ b/src/stub/src/powerpc64le-linux.kernel.vmlinux-head.S
@@ -28,4 +28,4 @@
         mflr 31
         bl LINUX000
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/stub/src/powerpc64le-linux.kernel.vmlinux.S b/src/stub/src/powerpc64le-linux.kernel.vmlinux.S
index bb614be4..ba8d1df7 100644
--- a/src/stub/src/powerpc64le-linux.kernel.vmlinux.S
+++ b/src/stub/src/powerpc64le-linux.kernel.vmlinux.S
@@ -146,4 +146,4 @@ section LZMA
 
 #include "include/header.S"
 
-// vi:ts=8:et:nowrap
+/* vim:set ts=8 sw=8 et: */
diff --git a/src/version.h b/src/version.h
index 6427e279..d4f11bb2 100644
--- a/src/version.h
+++ b/src/version.h
@@ -4,3 +4,5 @@
 #define UPX_VERSION_DATE        "Sep 22nd 2016"
 #define UPX_VERSION_DATE_ISO    "2016-09-22"
 #define UPX_VERSION_YEAR        "2016"
+
+/* vim:set ts=4 sw=4 et: */
diff --git a/src/work.cpp b/src/work.cpp
index 4905d6ce..67ae023d 100644
--- a/src/work.cpp
+++ b/src/work.cpp
@@ -341,8 +341,4 @@ void do_files(int i, int argc, char *argv[])
         UiPacker::uiFileInfoTotal();
 }
 
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */