diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index bdf591ac7b..676738078c 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2196,6 +2196,10 @@ au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias
 " Zig and Zig Object Notation (ZON)
 au BufNewFile,BufRead *.zig,*.zon		setf zig
 
+" Ziggy and Ziggy Schema
+au BufNewFile,BufRead *.ziggy                   setf ziggy
+au BufNewFile,BufRead *.ziggy-schema            setf ziggy_schema
+
 " Zserio
 au BufNewFile,BufRead *.zs			setf zserio
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 3aa3e97f4e..9c2a5e8e59 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -864,6 +864,8 @@ def s:GetFilenameChecks(): dict<list<string>>
     z8a: ['file.z8a'],
     zathurarc: ['zathurarc'],
     zig: ['file.zig', 'build.zig.zon'],
+    ziggy: ['file.ziggy'],
+    ziggy_schema: ['file.ziggy-schema'],
     zimbu: ['file.zu'],
     zimbutempl: ['file.zut'],
     zserio: ['file.zs'],
diff --git a/src/version.c b/src/version.c
index a321cc53e3..d526d9f469 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 */
+/**/
+    636,
 /**/
     635,
 /**/