diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index b3cec87..6e9f0b2 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1133,6 +1133,10 @@
 " IDL (Interactive Data Language), Prolog, Cproto or zsh module C
 au BufNewFile,BufRead *.pro			call dist#ft#ProtoCheck('idlang')
 
+" Idris2
+au BufNewFile,BufRead *.idr			setf idris2
+au BufNewFile,BufRead *.lidr			setf lidris2
+
 " Indent RC
 au BufNewFile,BufRead indentrc			setf indent
 
@@ -1152,6 +1156,9 @@
 " Ipfilter
 au BufNewFile,BufRead ipf.conf,ipf6.conf,ipf.rules	setf ipfilter
 
+" Ipkg
+au BufNewFile,BufRead *.ipkg			setf ipkg
+
 " Informix 4GL (source - canonical, include file, I4GL+M4 preproc.)
 au BufNewFile,BufRead *.4gl,*.4gh,*.m4gl	setf fgl
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 9ddab96..cca619b 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -359,12 +359,14 @@
     ibasic: ['file.iba', 'file.ibi'],
     icemenu: ['/.icewm/menu', 'any/.icewm/menu'],
     icon: ['file.icn'],
+    idris2: ['file.idr'],
     indent: ['.indent.pro', 'indentrc'],
     inform: ['file.inf', 'file.INF'],
     initng: ['/etc/initng/any/file.i', 'file.ii', 'any/etc/initng/any/file.i'],
     inittab: ['inittab'],
     inko: ['file.inko'],
     ipfilter: ['ipf.conf', 'ipf6.conf', 'ipf.rules'],
+    ipkg: ['file.ipkg'],
     iss: ['file.iss'],
     ist: ['file.ist', 'file.mst'],
     j: ['file.ijs'],
@@ -415,6 +417,7 @@
     lftp: ['lftp.conf', '.lftprc', 'anylftp/rc', 'lftp/rc', 'some-lftp/rc'],
     lhaskell: ['file.lhs'],
     libao: ['/etc/libao.conf', '/.libao', 'any/.libao', 'any/etc/libao.conf'],
+    lidris2: ['file.lidr'],
     lifelines: ['file.ll'],
     lilo: ['lilo.conf', 'lilo.conf-file'],
     lilypond: ['file.ly', 'file.ily'],
diff --git a/src/version.c b/src/version.c
index f13567f..d00d280 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    840,
+/**/
     839,
 /**/
     838,