diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index 2814ac5..6100340 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -861,7 +861,7 @@ to get illegal syntax when uncommenting them.
 8. Changelog                                                *NERDComChangelog*
 
 2.1.9
-    - added support for mrxvtrc, thx to Marco for the email
+    - added support for mrxvtrc and aap, thx to Marco for the emails
     - added dummy support for SVNAnnotate, SVKAnnotate and CVSAnnotate, thx to
       nicothakis for posting the issue
 
@@ -1196,5 +1196,5 @@ Brett Warneke                       spectre
 Pipp                                lhaskell
 Renald Buter                        scala
 Vladimir Lomov                      asymptote
-Marco                               mrxvtrc
+Marco                               mrxvtrc, aap
 nicothakis                          SVNAnnotate, CVSAnnotate, SVKAnnotate
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index 09b36ab..cf01ea6 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -132,6 +132,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
     "hardcoded the comment delimiters to use 
     if a:filetype == "" 
         call s:MapDelimiters('', '')
+    elseif a:filetype == "aap" 
+        call s:MapDelimiters('#', '')
     elseif a:filetype == "abaqus" 
         call s:MapDelimiters('**', '')
     elseif a:filetype == "abc"