diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 24388b9..5cace2e2 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -228,7 +228,7 @@
     dtd: ['file.dtd'],
     dtrace: ['/usr/lib/dtrace/io.d'],
     dts: ['file.dts', 'file.dtsi', 'file.dtso', 'file.its', 'file.keymap'],
-    dune: ['jbuild', 'dune', 'dune-project', 'dune-workspace'],
+    dune: ['jbuild', 'dune', 'dune-project', 'dune-workspace', 'dune-file'],
     dylan: ['file.dylan'],
     dylanintr: ['file.intr'],
     dylanlid: ['file.lid'],
@@ -527,7 +527,7 @@
     odin: ['file.odin'],
     omnimark: ['file.xom', 'file.xin'],
     ondir: ['.ondirrc'],
-    opam: ['opam', 'file.opam', 'file.opam.template'],
+    opam: ['opam', 'file.opam', 'file.opam.template', 'opam.locked', 'file.opam.locked'],
     openroad: ['file.or'],
     openscad: ['file.scad'],
     openvpn: ['file.ovpn', '/etc/openvpn/client/client.conf', '/usr/share/openvpn/examples/server.conf'],
diff --git a/src/version.c b/src/version.c
index 15b8deb..428cd04 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    586,
+/**/
     585,
 /**/
     584,