diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index b4a9564181..c0c87ff177 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1717,12 +1717,15 @@ au BufNewFile,BufRead *.robot,*.resource	setf robot
 " Robots.txt
 au BufNewFile,BufRead robots.txt		setf robots
 
-" Rpcgen
-au BufNewFile,BufRead *.x			setf rpcgen
+" RON (Rusty Object Notation)
+au BufNewFile,BufRead *.ron			setf ron
 
 " MikroTik RouterOS script
 au BufRead,BufNewFile *.rsc			setf routeros
 
+" Rpcgen
+au BufNewFile,BufRead *.x			setf rpcgen
+
 " reStructuredText Documentation Format
 au BufNewFile,BufRead *.rst			setf rst
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 9cbc5852c6..ed4a86337e 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -488,6 +488,7 @@ let s:filename_checks = {
     \ 'rnoweb': ['file.rnw', 'file.snw'],
     \ 'robot': ['file.robot', 'file.resource'],
     \ 'robots': ['robots.txt'],
+    \ 'ron': ['file.ron'],
     \ 'routeros': ['file.rsc'],
     \ 'rpcgen': ['file.x'],
     \ 'rpl': ['file.rpl'],
diff --git a/src/version.c b/src/version.c
index d185852485..2f5e3bffa5 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 */
+/**/
+    1282,
 /**/
     1281,
 /**/