diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index 47ef5e6..1c9364d 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -861,6 +861,7 @@ if your face looked like a toaster and a t-rex put together? :(
 
 2.1.18
     - add support for llvm. Thanks to nicothakis.
+    - add support for xquery. Thanks to Phillip Kovalev.
 2.1.17
     - fixed haskell delimiters (hackily). Thanks to Elias Pipping.
     - add support for mailcap. Thanks to Pascal Brueckner.
@@ -1282,6 +1283,7 @@ Chris                               map
 Krzysztof A. Adamski                group
 Pascal Brueckner                    mailcap
 Jerónimo Carballo                   stata
+Phillip Kovalev                     xquery
 
 ==============================================================================
 8. License                                                    *NERDComLicense*
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index f3774ef..1d0f177 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -895,6 +895,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('/*','*/')
     elseif a:filetype == "yaml"
         call s:MapDelimiters('#','')
+    elseif a:filetype == "xquery"
+        call s:MapDelimiters('(:',':)')
     elseif a:filetype == "z8a"
         call s:MapDelimiters(';', '')