diff --git a/README.rst b/README.rst
index 20c3f217..1a3d12f2 100644
--- a/README.rst
+++ b/README.rst
@@ -19,9 +19,11 @@ Features
 Pelican currently supports:
 
 * Blog articles and pages
-* Comments, via an external service (Disqus). (Please note that while
-  useful, Disqus is an external service, and thus the comment data will be
-  somewhat outside of your control and potentially subject to data loss.)
+* Comments
+
+  * via a pelican plugin (`Pelican Comment System`_)
+  * via an external service (Disqus). (Please note that while useful, Disqus is an external service, and thus the comment data will be somewhat outside of your control and potentially subject to data loss.)
+
 * Theming support (themes are created using Jinja2_ templates)
 * PDF generation of the articles/pages (optional)
 * Publication of articles in multiple languages
@@ -66,3 +68,4 @@ client handy, use the webchat_ for quick feedback.
 .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
 .. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
 .. _contribute: http://docs.getpelican.com/en/latest/contribute.html
+.. _`Pelican Comment System`: https://github.com/getpelican/pelican-plugins/tree/master/pelican_comment_system
diff --git a/docs/index.rst b/docs/index.rst
index 43193e9e..73cecad4 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -24,9 +24,11 @@ Features
 Pelican |version| currently supports:
 
 * Articles (e.g., blog posts) and pages (e.g., "About", "Projects", "Contact")
-* Comments, via an external service (Disqus). (Please note that while
-  useful, Disqus is an external service, and thus the comment data will be
-  somewhat outside of your control and potentially subject to data loss.)
+* Comments
+
+  * via a pelican plugin (`Pelican Comment System`_)
+  * via an external service (Disqus). (Please note that while useful, Disqus is an external service, and thus the comment data will be somewhat outside of your control and potentially subject to data loss.)
+
 * Theming support (themes are created using Jinja2_ templates)
 * Publication of articles in multiple languages
 * Atom/RSS feeds
@@ -91,3 +93,5 @@ A French version of the documentation is available at :doc:`fr/index`.
 .. _`Pelican's internals`: http://docs.getpelican.com/en/latest/internals.html
 .. _`#pelican on Freenode`: irc://irc.freenode.net/pelican
 .. _webchat: http://webchat.freenode.net/?channels=pelican&uio=d4
+.. _`Pelican Comment System`: https://github.com/getpelican/pelican-plugins/tree/master/pelican_comment_system
+