diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 209f0dc2e7..a6f13c8b88 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1023,6 +1023,14 @@ au BufNewFile,BufRead *.gjs			setf javascript.glimmer
 " Gnuplot scripts
 au BufNewFile,BufRead *.gpi,*.gnuplot,.gnuplot_history	setf gnuplot
 
+" GNU Radio Companion files
+au BufNewFile,BufRead *.grc
+	\ if getline(1) =~# '<?xml' |
+	\   setf xml |
+	\ else |
+	\   setf yaml |
+	\ endif
+
 " Go (Google)
 au BufNewFile,BufRead *.go			setf go
 au BufNewFile,BufRead Gopkg.lock		setf toml
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index bfafdbb361..7cac3d0aa2 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -1631,6 +1631,22 @@ func Test_git_file()
   filetype off
 endfunc
 
+func Test_grc_file()
+  filetype on
+
+  call writefile(['<?xml version="1.0"?>', '<block>', '</block>'], 'Xfile.grc')
+  split Xfile.grc
+  call assert_equal('xml', &filetype)
+  bwipe!
+
+  call writefile(['metadata:', '  file_format: 1'], 'Xfile.grc')
+  split Xfile.grc
+  call assert_equal('yaml', &filetype)
+  bwipe!
+
+  filetype off
+endfunc
+
 func Test_haredoc_file()
   filetype on
   call assert_true(mkdir('foo/bar', 'pR'))
diff --git a/src/version.c b/src/version.c
index d64a1e6c54..c0c98b40ba 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 */
+/**/
+    1360,
 /**/
     1359,
 /**/