diff --git a/syntax/wiki.vim b/syntax/wiki.vim
index 9f1abbb..b3cca01 100644
--- a/syntax/wiki.vim
+++ b/syntax/wiki.vim
@@ -243,8 +243,17 @@ execute 'syntax match wikiItalicT'
       \ 'contained contains=@Spell'
 syntax match wikiConcealItalic /_/ contained conceal
 
+execute 'syntax match wikiBoldItalic'
+      \ '/' . wiki#rx#bolditalic . '/'
+      \ 'contains=wikiConcealBold,wikiConcealItalic,@Spell'
+execute 'syntax match wikiItalicBold'
+      \ '/' . wiki#rx#italicbold . '/'
+      \ 'contains=wikiConcealBold,wikiConcealItalic,@Spell'
+
 highlight default wikiBold cterm=bold gui=bold
 highlight default wikiItalic cterm=italic gui=italic
+highlight default wikiBoldItalic cterm=italic,bold gui=italic,bold
+highlight default link wikiItalicBold wikiBoldItalic
 
 " }}}1
 " {{{1 Math