diff --git a/docs/source/index.rst b/docs/source/index.rst
index 22a788e..c2be159 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -3,6 +3,9 @@
 Welcome to ndnSIM NS-3 based NDN simulator
 ==========================================
 
+We invite you to `join our mailing list <http://www.lists.cs.ucla.edu/mailman/listinfo/ndnsim>`_ to see and participate in discussions about ndnSIM implementation and simulations in general (`mailing list archives <http://www.lists.cs.ucla.edu/pipermail/ndnsim/>`_). 
+
+
 Contents:
 
 .. toctree::
diff --git a/docs/source/intro.rst b/docs/source/intro.rst
index d89f320..845dd1c 100644
--- a/docs/source/intro.rst
+++ b/docs/source/intro.rst
@@ -70,9 +70,9 @@
 
 `ndnSIM API documentation <doxygen/index.html>`_
 
-.. It is also possible to build doxygen documentation of ndnSIM API (in ``ns-3/doc/html/``), provided that ``doxygen`` and ``graphviz`` modules are installed on system::
+Also, you can `join our mailing list <http://www.lists.cs.ucla.edu/mailman/listinfo/ndnsim>`_ to see and participate in discussions about ndnSIM implementation and simulations in general.   
+Do not forget to check mailling list `archives <http://www.lists.cs.ucla.edu/pipermail/ndnsim/>`_.  
 
-..     ./waf doxygen
 
 Support
 -------
diff --git a/helper/ndn-header-helper.h b/helper/ndn-header-helper.h
index f89c7d3..d7ea296 100644
--- a/helper/ndn-header-helper.h
+++ b/helper/ndn-header-helper.h
@@ -83,7 +83,7 @@
    *                          |               |
    *                      terminator      DTAG (Dictionary TAG)
    *
-   * \see http://www.ndn.org/releases/latest/doc/technical/BinaryEncoding.html
+   * \see http://www.ccnx.org/releases/latest/doc/technical/BinaryEncoding.html
    */
   
   static Type