diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f91d405f7d..2c46c57b1e 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -452,6 +452,9 @@ au BufNewFile,BufRead .clang-format		setf yaml
 " Clang-tidy
 au BufNewFile,BufRead .clang-tidy		setf yaml
 
+" Conda configuration file
+au BufNewFile,BufRead .condarc,condarc		setf yaml
+
 " Matplotlib
 au BufNewFile,BufRead *.mplstyle,matplotlibrc	setf yaml
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 51f4dc1c89..ef1d8b57e7 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -889,7 +889,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     xslt: ['file.xsl', 'file.xslt'],
     yacc: ['file.yy', 'file.yxx', 'file.y++'],
     yaml: ['file.yaml', 'file.yml', 'file.eyaml', 'any/.bundle/config', '.clangd', '.clang-format', '.clang-tidy', 'file.mplstyle', 'matplotlibrc', 'yarn.lock',
-           '/home/user/.kube/config'],
+           '/home/user/.kube/config', '.condarc', 'condarc'],
     yang: ['file.yang'],
     yuck: ['file.yuck'],
     z8a: ['file.z8a'],
diff --git a/src/version.c b/src/version.c
index 724fa61402..5a9f50f6ee 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    902,
 /**/
     901,
 /**/