diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ae52604..7ef6139 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -859,9 +859,13 @@
 " Httest
 au BufNewFile,BufRead *.htt,*.htb		setf httest
 
-" i3 (and sway)
-au BufNewFile,BufRead */i3/config,*/sway/config		setf i3config
-au BufNewFile,BufRead */.i3/config,*/.sway/config	setf i3config
+" i3
+au BufNewFile,BufRead */i3/config		setf i3config
+au BufNewFile,BufRead */.i3/config  	setf i3config
+
+" sway
+au BufNewFile,BufRead */sway/config		setf swayconfig
+au BufNewFile,BufRead */.sway/config	setf swayconfig
 
 " Icon
 au BufNewFile,BufRead *.icn			setf icon
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 0104fdb..bfa4d50 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -535,6 +535,7 @@
     \ 'svelte': ['file.svelte'],
     \ 'svg': ['file.svg'],
     \ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'],
+    \ 'swayconfig': ['/home/user/.sway/config', '/home/user/.config/sway/config', '/etc/sway/config', '/etc/xdg/sway/config'],
     \ 'swift': ['file.swift'],
     \ 'swiftgyb': ['file.swift.gyb'],
     \ 'sysctl': ['/etc/sysctl.conf', '/etc/sysctl.d/file.conf', 'any/etc/sysctl.conf', 'any/etc/sysctl.d/file.conf'],
diff --git a/src/version.c b/src/version.c
index 4d97dcd..fde548b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    93,
+/**/
     92,
 /**/
     91,