diff --git a/docs/source/RELEASE_NOTES.rst b/docs/source/RELEASE_NOTES.rst
index a725c0e..8493cc3 100644
--- a/docs/source/RELEASE_NOTES.rst
+++ b/docs/source/RELEASE_NOTES.rst
@@ -5,8 +5,38 @@
 
 All of the ndnSIM documentation is accessible from the `ndnSIM website <http://ndnsim.net>`__.
 
-Release 2.4 (Changes since release 2.3)
----------------------------------------
+Release 2.5
+-----------
+
+Release date: February 23, 2018
+
+Overview
+~~~~~~~~
+
+- The submodules of NFD and ndn-cxx have been upgraded to version 0.6.1
+  (:issue:`4514`).
+
+  `NFD 0.6.1 release notes <https://named-data.net/doc/NFD/0.6.1/RELEASE_NOTES.html>`__
+
+  `ndn-cxx 0.6.1 release notes <https://named-data.net/doc/ndn-cxx/0.6.1/RELEASE_NOTES.html>`__
+
+    .. note::
+       In order to retrieve the marked versions of ndn-cxx and NFD, use
+       ``--recursive`` option to the git clone command or run ``git
+       submodule update --init`` after clone, pull, or merge.
+
+Improvements and bug fixes
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Fix memory leak related to canceling events scheduled via ndn-cxx's Scheduler interface
+  adapted for NS-3 (:issue:`4509`).
+
+- Fix compilation failure with boost >= 1.66 (:issue:`4471`).
+
+- Updates of the ndnSIM documentation.
+
+Release 2.4
+-----------
 
 Release date: November 1, 2017
 
@@ -35,7 +65,7 @@
     .. note::
        ndnSIM 2.4 requires the following minimal compiler requirements:
          - g++-4.9 or later (Note:  this is an upgraded requirement from ndnSIM 2.3)
-         - Apple LLVM version 7.0.2 or later 
+         - Apple LLVM version 7.0.2 or later
          - clang-3.3 or later.
 
 Improvements and bug fixes
@@ -49,8 +79,8 @@
   * Added page about community contributions to the simulator.
   * CS tracer documentation update.
 
-Release 2.3 (Changes since release 2.2)
----------------------------------------
+Release 2.3
+-----------
 
 Release date: December 12, 2016
 
@@ -125,8 +155,8 @@
 
   * Added explanation about the support of NDNLPv2 and its implications.
 
-Release 2.2 (Changes since release 2.1)
----------------------------------------
+Release 2.2
+-----------
 
 Release date: November 11, 2016
 
@@ -208,8 +238,8 @@
 
 ********************************************************************************
 
-Release 2.1 (Changes since release 2.0)
----------------------------------------
+Release 2.1
+-----------
 
 Release date: September 4, 2015
 
@@ -347,9 +377,8 @@
 ********************************************************************************
 
 
-
-Release 2.0 (Changes since release 1.0)
----------------------------------------
+Release 2.0
+-----------
 
 Release date: January 13, 2015
 
diff --git a/docs/source/_templates/indexcontent.html b/docs/source/_templates/indexcontent.html
index 7d73e6e..ac24170 100644
--- a/docs/source/_templates/indexcontent.html
+++ b/docs/source/_templates/indexcontent.html
@@ -59,8 +59,9 @@
       <td width="50%" valign="top">
         <h2>ndnSIM Versions</h2>
         <div class="tile">
-          <p class="biglink"><a class="biglink" href="#">ndnSIM 2.4</a><br/>
+          <p class="biglink"><a class="biglink" href="#">ndnSIM 2.5</a><br/>
             <span class="linkdescr">latest version</span></p>
+          <p class="biglink"><a class="biglink" href="http://ndnsim.net/2.4/">ndnSIM 2.4</a><br/>
           <p class="biglink"><a class="biglink" href="http://ndnsim.net/2.3/">ndnSIM 2.3</a><br/>
           <p class="biglink"><a class="biglink" href="http://ndnsim.net/2.2/">ndnSIM 2.2</a><br/>
           <p class="biglink"><a class="biglink" href="http://ndnsim.net/2.1/">ndnSIM 2.1</a><br/>
diff --git a/docs/source/intro.rst b/docs/source/intro.rst
index a3dea20..aff58e1 100644
--- a/docs/source/intro.rst
+++ b/docs/source/intro.rst
@@ -36,7 +36,7 @@
 strategies) inside ndnSIM can be directly used within the real NFD implementation.
 
 Specifically, the simulator directly uses NFD implementations of :nfd:`pending Interest
-table (PIT) <nfd::pit::Pit>`, :nfd:`forwarding information base (FIB) <nfd::fib::Fib>`, and
+table (PIT) <nfd::Pit>`, :nfd:`forwarding information base (FIB) <nfd::Fib>`, and
 :nfd:`content store <nfd::cs::Cs>` data structures.  In addition to that, ndnSIM allows
 experimentation with :ndnSIM:`ndnSIM-specific content store <ndn::ContentStore>` along
 with its cache replacement policies ported from the previous version of ndnSIM.