diff --git a/.gitmodules b/.gitmodules
index d74ae3056..04e895219 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -42,3 +42,6 @@
 [submodule "contrib/syl20bnr/extensions/o-blog"]
 	path = contrib/syl20bnr/extensions/o-blog
 	url = https://github.com/renard/o-blog.git
+[submodule "spacemacs/extensions/evil-nerd-commenter"]
+	path = spacemacs/extensions/evil-nerd-commenter
+	url = https://github.com/redguardtoo/evil-nerd-commenter
diff --git a/spacemacs/extensions.el b/spacemacs/extensions.el
index 4a2529e05..a05ab4f18 100644
--- a/spacemacs/extensions.el
+++ b/spacemacs/extensions.el
@@ -13,6 +13,7 @@
     centered-cursor
     dos
     emoji-cheat-sheet
+    evil-nerd-commenter
     evil-org-mode
     evil-plugins
     helm-rcirc
@@ -51,6 +52,19 @@
   (use-package emoji-cheat-sheet
     :commands emoji-cheat-sheet))
 
+(defun spacemacs/init-evil-nerd-commenter ()
+  (use-package evil-nerd-commenter
+    :init
+    (progn
+      (evil-leader/set-key
+        "ncl" 'evilnc-comment-or-uncomment-lines
+        "nct" 'evilnc-quick-comment-or-uncomment-to-the-line
+        "ncy" 'evilnc-copy-and-comment-lines
+        "ncp" 'evilnc-comment-or-uncomment-paragraphs
+        "ncr" 'comment-or-uncomment-region
+        "nci" 'evilnc-toggle-invert-comment-line-by-line
+        "ncc" 'evilnc-comment-operator))))
+
 (defun spacemacs/init-evil-org-mode ()
   (use-package evil-org
     :commands evil-org-mode
diff --git a/spacemacs/extensions/evil-nerd-commenter b/spacemacs/extensions/evil-nerd-commenter
new file mode 160000
index 000000000..c54cee264
--- /dev/null
+++ b/spacemacs/extensions/evil-nerd-commenter
@@ -0,0 +1 @@
+Subproject commit c54cee2648f6b2b2bbcf5856acebde3b4a20eddb
diff --git a/spacemacs/packages.el b/spacemacs/packages.el
index a53a42904..58227e1b9 100644
--- a/spacemacs/packages.el
+++ b/spacemacs/packages.el
@@ -34,7 +34,6 @@
     evil-surround
     evil-terminal-cursor-changer
     evil-visualstar
-    evil-nerd-commenter
     exec-path-from-shell
     expand-region
     fill-column-indicator
@@ -364,20 +363,6 @@ DELETE-FUNC when calling CALLBACK.
       ;; load surround
       (use-package evil-surround
         :init (global-evil-surround-mode 1))
-      ;; load nerd-commenter
-      (if (version< emacs-version "24.4")
-          (use-package evil-nerd-commenter
-            :init
-            (progn
-              (evil-leader/set-key
-                "ncl" 'evilnc-comment-or-uncomment-lines
-                "nct" 'evilnc-quick-comment-or-uncomment-to-the-line
-                "ncy" 'evilnc-copy-and-comment-lines
-                "ncp" 'evilnc-comment-or-uncomment-paragraphs
-                "ncr" 'comment-or-uncomment-region
-                "nci" 'evilnc-toggle-invert-comment-line-by-line
-                "ncc" 'evilnc-comment-operator
-                ))))
       ;; load evil-exchange
       (use-package evil-exchange
         :init (evil-exchange-install))