diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index 3252123..d94d577 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -798,6 +798,10 @@ if your face looked like a toaster and a t-rex put together? :(
 ==============================================================================
 8. Changelog                                                *NERDComChangelog*
 
+2.2.x
+    - add support for dhcpd, limits, ntp, resolv, rgb, sysctl, udevconf and
+      udevrules. Thanks to Thilo Six.
+
 2.2.1
     - add support for newlisp and clojure, thanks to Matthew Lee Hinman.
     - fix automake comments, thanks to Elias Pipping
@@ -1055,6 +1059,8 @@ David                               conkyrc
 Miguel Jaque Barbero                SVNannotate
 Stefan Walk                         sieve
 Adam Thorsen                        objj
+Thilo Six                           dhcpd, limits, ntp, resolv, rgb, sysctl,
+                                    udevconf, udevrules
 
 ==============================================================================
 9. License                                                    *NERDComLicense*
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index 155f5ac..41b3435 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -269,6 +269,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters(';', '')
     elseif a:filetype == "desktop"
         call s:MapDelimiters('#', '')
+    elseif a:filetype == "dhcpd"
+        call s:MapDelimiters('#', '')
     elseif a:filetype == "diff"
         call s:MapDelimiters('#', '')
     elseif a:filetype == "django"
@@ -461,6 +463,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('#', '')
     elseif a:filetype == "lilypond"
         call s:MapDelimiters('%', '')
+    elseif a:filetype == "limits"
+        call s:MapDelimiters('#', '')
     elseif a:filetype == "liquid"
         call s:MapDelimiters('{%', '%}')
     elseif a:filetype == "lisp"
@@ -567,6 +571,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('\"', '')
     elseif a:filetype == "nsis"
         call s:MapDelimiters('#', '')
+    elseif a:filetype == "ntp"
+        call s:MapDelimiters('#', '')
     elseif a:filetype == "objc"
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
     elseif a:filetype == "objcpp"
@@ -677,8 +683,12 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters(';', '')
     elseif a:filetype == "remind"
         call s:MapDelimiters('#', '')
+    elseif a:filetype == "resolv"
+        call s:MapDelimiters('#', '')
     elseif a:filetype == "rexx"
         call s:MapDelimiters('/*','*/')
+    elseif a:filetype == "rgb"
+        call s:MapDelimiters('!', '')
     elseif a:filetype == "rib"
         call s:MapDelimiters('#','')
     elseif a:filetype == "robots"
@@ -805,6 +815,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('','')
     elseif a:filetype == "SVNinfo"
         call s:MapDelimiters('','')
+    elseif a:filetype == "sysctl"
+        call s:MapDelimiters('#', '')
     elseif a:filetype == "systemverilog"
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
     elseif a:filetype == "tads"
@@ -849,6 +861,10 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('%','')
     elseif a:filetype == "uc"
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
+    elseif a:filetype == "udevconf"
+        call s:MapDelimiters('#', '')
+    elseif a:filetype == "udevrules"
+        call s:MapDelimiters('#', '')
     elseif a:filetype == "uil"
         call s:MapDelimiters('!', '')
     elseif a:filetype == "vb"