diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index bead0f31f2..cdeb556410 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1511,6 +1511,9 @@ au BufNewFile,BufRead *.pdf				setf pdf
 " PCMK - HAE - crm configure edit
 au BufNewFile,BufRead *.pcmk				setf pcmk
 
+" PEM (Privacy-Enhanced Mail)
+au BufNewFile,BufRead *.pem,*.cer,*.crt,*.csr		setf pem
+
 " Perl
 if has("fname_case")
   au BufNewFile,BufRead *.pl,*.PL			call dist#ft#FTpl()
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index cf74a02552..e2f2f045bb 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -506,6 +506,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     pccts: ['file.g'],
     pcmk: ['file.pcmk'],
     pdf: ['file.pdf'],
+    pem: ['file.pem', 'file.cer', 'file.crt', 'file.csr'],
     perl: ['file.plx', 'file.al', 'file.psgi', 'gitolite.rc', '.gitolite.rc', 'example.gitolite.rc', '.latexmkrc', 'latexmkrc'],
     pf: ['pf.conf'],
     pfmain: ['main.cf', 'main.cf.proto'],
diff --git a/src/version.c b/src/version.c
index 5c83d40294..d18ecc1a6a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1668,
 /**/
     1667,
 /**/