diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index acb542ad..95e232eb 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -804,6 +804,7 @@ if your face looked like a toaster and a t-rex put together? :(
     - match filetypes case insensitively
     - add support for mp (metapost), thanks to Andrey Skvortsov.
     - add support for htmlcheetah, thanks to Simon Hengel.
+    - add support for javacc, thanks to Matt Tolton.
 
 2.2.1
     - add support for newlisp and clojure, thanks to Matthew Lee Hinman.
@@ -1066,6 +1067,7 @@ Thilo Six                           dhcpd, limits, ntp, resolv, rgb, sysctl,
                                     udevconf, udevrules
 Andrey Skvortsov                    mp
 Simon Hengel                        htmlcheetah
+Matt Tolton                         javacc
 ==============================================================================
 9. License                                                    *NERDComLicense*
 
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index 92fdc54c..3a9e5d58 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -426,6 +426,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('/*','*/')
     elseif a:filetype ==? "java"
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype ==? "javacc"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
     elseif a:filetype ==? "javascript"
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
     elseif a:filetype ==? "jess"