diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index 2ef1e51..47ef5e6 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -859,6 +859,8 @@ if your face looked like a toaster and a t-rex put together? :(
 ==============================================================================
 7. Changelog                                                *NERDComChangelog*
 
+2.1.18
+    - add support for llvm. Thanks to nicothakis.
 2.1.17
     - fixed haskell delimiters (hackily). Thanks to Elias Pipping.
     - add support for mailcap. Thanks to Pascal Brueckner.
@@ -1264,6 +1266,7 @@ Vladimir Lomov                      asymptote
 Marco                               mrxvtrc, aap
 nicothakis                          SVNAnnotate, CVSAnnotate, SVKAnnotate,
                                     SVNdiff, gitAnnotate, gitdiff, dtrace
+                                    llvm
 Chen Xing                           Wikipedia
 Jacobo Diaz                         dakota, patran
 Li Jin                              gentoo-env-d, gentoo-init-d,
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index c42b8b5..f3774ef 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -465,6 +465,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimitersWithAlternative(';','', '#|', '|#')
     elseif a:filetype == "lite"
         call s:MapDelimiters('/*','*/')
+    elseif a:filetype == "llvm"
+        call s:MapDelimiters(';','')
     elseif a:filetype == "lookupfile"
         call s:MapDelimiters('', '')
     elseif a:filetype == "lotos"