diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e4910e3..4faead9 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -216,6 +216,9 @@
 " BDF font
 au BufNewFile,BufRead *.bdf			setf bdf
 
+" Beancount
+au BufNewFile,BufRead *.beancount		setf beancount
+
 " BibTeX bibliography database file
 au BufNewFile,BufRead *.bib			setf bib
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 4104ec2..06b8e99 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -79,6 +79,7 @@
     \ 'bzl': ['file.bazel', 'file.bzl', 'WORKSPACE'],
     \ 'bc': ['file.bc'],
     \ 'bdf': ['file.bdf'],
+    \ 'beancount': ['file.beancount'],
     \ 'bib': ['file.bib'],
     \ 'bindzone': ['named.root', '/bind/db.file', '/named/db.file', 'any/bind/db.file', 'any/named/db.file'],
     \ 'blank': ['file.bl'],
diff --git a/src/version.c b/src/version.c
index 7323b8f..304a730 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2522,
+/**/
     2521,
 /**/
     2520,