diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index fc6a07c..e0c0804 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -813,6 +813,7 @@ if your face looked like a toaster and a t-rex put together? :(
     - add support for conkyrc, thanks to David
     - add support for SVNannotate, thanks to Miguel Jaque Barbero.
     - add support for sieve, thanks to Stefan Walk
+    - add support for objj, thanks to Adam Thorsen.
 
 2.2.0
     - rewrote the mappings system to be more "standard".
@@ -1053,6 +1054,7 @@ Keitheis                            mako, genshi
 David                               conkyrc
 Miguel Jaque Barbero                SVNannotate
 Stefan Walk                         sieve
+Adam Thorsen                        objj
 
 ==============================================================================
 9. License                                                    *NERDComLicense*
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index 41309e9..35f4002 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -571,6 +571,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
     elseif a:filetype == "objcpp"
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "objj"
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
     elseif a:filetype == "ocaml"
         call s:MapDelimiters('(*','*)')
     elseif a:filetype == "occam"