diff --git a/docs/doxygen.conf.in b/docs/doxygen.conf.in
index f6c3bf4..d3d4c5a 100644
--- a/docs/doxygen.conf.in
+++ b/docs/doxygen.conf.in
@@ -2055,7 +2055,8 @@
                          PUBLIC_WITH_TESTS_ELSE_PROTECTED=protected \
                          PUBLIC_WITH_TESTS_ELSE_PRIVATE=private \
                          PROTECTED_WITH_TESTS_ELSE_PRIVATE=private \
-                         VIRTUAL_WITH_TESTS=
+                         VIRTUAL_WITH_TESTS= \
+                         BOOST_CONCEPT_ASSERT(x)=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
diff --git a/docs/release-notes-latest.rst b/docs/release-notes-latest.rst
index cbbc128..e25a31f 120000
--- a/docs/release-notes-latest.rst
+++ b/docs/release-notes-latest.rst
@@ -1 +1 @@
-release-notes/release-notes-0.6.0.rst
\ No newline at end of file
+release-notes/release-notes-0.6.1.rst
\ No newline at end of file
diff --git a/docs/release-notes/release-notes-0.2.0.rst b/docs/release-notes/release-notes-0.2.0.rst
index 718a39b..0a8c10f 100644
--- a/docs/release-notes/release-notes-0.2.0.rst
+++ b/docs/release-notes/release-notes-0.2.0.rst
@@ -32,8 +32,7 @@
     The new option also allow periodic reloading trust anchors, allowing dynamic trust
     models.
 
-  + Added support for multiple signature types to :ndn-cxx:`PublicKey`,
-    :ndn-cxx:`SecPublicInfo` abstractions
+  + Added support for multiple signature types to ``PublicKey``, ``SecPublicInfo`` abstractions
 
   + New :ndn-cxx:`SignatureSha256WithEcdsa` signature type
 
@@ -64,7 +63,7 @@
   + Introduce :ndn-cxx:`Scheduler::cancelAllEvents` to cancel all previously scheduled events
     (:issue:`1757`)
 
-  + Introduce :ndn-cxx:`util::EventEmitter`, :ndn-cxx:`util::NotificationSubscriber`,
+  + Introduce ``util::EventEmitter``, :ndn-cxx:`util::NotificationSubscriber`,
     :ndn-cxx:`util::NotificationStream`, and :ndn-cxx:`nfd::FaceMonitor` utility classes
 
   + Introduce :ndn-cxx:`util::SegmentFetcher` helper class to fetch multi-segmented data
@@ -123,12 +122,11 @@
     Sub-classes of :ndn-cxx:`Validator` class can use the following hooks to fine-tune the
     validation process:
 
-      * :ndn-cxx:`Validator::preCertificateValidation <preCertificateValidation>` to
-        process received certificate before validation.
-      * :ndn-cxx:`Validator::onTimeout <onTimeout>` to process interest timeout
-      * :ndn-cxx:`Validator::afterCheckPolicy <afterCheckPolicy>` to process validation requests.
+      * ``preCertificateValidation`` to process received certificate before validation.
+      * ``onTimeout`` to process interest timeout
+      * ``afterCheckPolicy`` to process validation requests.
 
-  + Fix memory issues in :ndn-cxx:`SecPublicInfoSqlite3`
+  + Fix memory issues in ``SecPublicInfoSqlite3``
 
 - **Miscellaneous tools**
 
@@ -156,7 +154,7 @@
 
 - ``name::Component::toEscapedString`` method, use :ndn-cxx:`name::Component::toUri` instead.
 
-- ``SecPublicInfo::addPublicKey`` method, use :ndn-cxx:`SecPublicInfo::addKey` instead.
+- ``SecPublicInfo::addPublicKey`` method, use ``SecPublicInfo::addKey`` instead.
 
 - ``Tlv::ConentType`` constant (typo), use ``Tlv::ContentType`` instead.
 
diff --git a/docs/release-notes/release-notes-0.3.1.rst b/docs/release-notes/release-notes-0.3.1.rst
index 982d8bd..7f8a9f0 100644
--- a/docs/release-notes/release-notes-0.3.1.rst
+++ b/docs/release-notes/release-notes-0.3.1.rst
@@ -13,9 +13,9 @@
   - Add isConnected() in :ndn-cxx:`signal::Connection` and :ndn-cxx:`signal::ScopedConnection`
     (:issue:`2308`)
 
-  - Extend :ndn-cxx:`DummyClientFace` to process :ndn-cxx:`LocalControlHeader` (:issue:`2510`)
+  - Extend :ndn-cxx:`DummyClientFace` to process ``LocalControlHeader`` (:issue:`2510`)
 
-  - Add CachingPolicy to :ndn-cxx:`LocalControlHeader` (:issue:`2183`)
+  - Add CachingPolicy to ``LocalControlHeader`` (:issue:`2183`)
 
 Updates and bug fixes:
 ^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/release-notes/release-notes-0.5.1.rst b/docs/release-notes/release-notes-0.5.1.rst
index 5a84ccb..cdb555a 100644
--- a/docs/release-notes/release-notes-0.5.1.rst
+++ b/docs/release-notes/release-notes-0.5.1.rst
@@ -4,9 +4,9 @@
 Release date: January 25, 2017
 
 .. note::
-   This is the last release of the library that supports :ref:`NDN Certificate format version 1
-   <Security Library Tutorial>` and the existing implementations of validators.  The upcoming
-   0.6.0 release will include multiple breaking changes of the security framework.
+   This is the last release of the library that supports NDN Certificate format version 1 and
+   the existing implementations of validators.  The upcoming 0.6.0 release will include
+   multiple breaking changes of the security framework.
 
 Changes since version 0.5.0:
 
diff --git a/docs/release-notes/release-notes-0.6.1.rst b/docs/release-notes/release-notes-0.6.1.rst
new file mode 100644
index 0000000..2770915
--- /dev/null
+++ b/docs/release-notes/release-notes-0.6.1.rst
@@ -0,0 +1,69 @@
+ndn-cxx version 0.6.1
+---------------------
+
+Release date: February 19, 2018
+
+New features:
+^^^^^^^^^^^^^
+
+- (potentially breaking change) :ndn-cxx:`expressInterest` now by default loopbacks Interests to
+  producer callbacks on the same :ndn-cxx:`Face`.  When undesired, use
+  ``InterestFilter::allowLoopback(false)`` (:issue:`3979`)
+
+- New signal in :ndn-cxx:`SegmentFetcher` to notify retrieval of Data segments
+  (:issue:`4438`)
+
+- Initial support for the Content Store management protocol
+  (:issue:`4050`)
+
+- Literal operators for ``time::duration`` types, such as ``1_s``, ``42_ms``, ``30_days``
+  (:issue:`4468`)
+
+- Support for BLAKE2 hash function (requires OpenSSL >= 1.1.0)
+
+- A ``escape()`` helper function complementing the existing ``unescape()`` (:issue:`4484`)
+
+Improvements and bug fixes
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- ``ndnsec key-gen`` command line now allows customization of key ID (:issue:`4294`)
+
+- Fixed encoding of ``'~'`` and ``'+'`` in :ndn-cxx:`Component::toUri()`
+  (:issue:`4484`)
+
+- Fixed handling of large dates when converting to/from string
+  (:issue:`4478`, :issue:`3915`)
+
+- Fixed error handling in :ndn-cxx:`KeyChain::importSafeBag()`
+  (:issue:`4359`)
+
+- Fixed parsing of IPv6 addresses with scope-id
+  (:issue:`4474`)
+
+- :ndn-cxx:`io::load()` now handles empty files properly
+  (:issue:`4434`)
+
+- Switched to using `boost::asio::basic_waitable_timer`
+  (:issue:`4431`)
+
+- Allow linking multiple :ndn-cxx:`DummyClientFace` instances together to emulate a broadcast medium
+  (:issue:`3913`)
+
+- Fixed build when ``std::to_string`` is not available
+  (:issue:`4393`)
+
+- Avoid undefined behavior when casting to :ndn-cxx:`tlv::SignatureTypeValue`
+  (:issue:`4370`)
+
+- Fixed compilation with Boost 1.66.0
+  (:issue:`4422`)
+
+- Various documentation updates
+  (:issue:`3918`, :issue: `4184`, :issue: `4275`)
+
+Removed
+^^^^^^^
+
+- Removed obsolete TLV-TYPE constants
+  (:issue:`4055`, :issue:`3098`, :issue: `3755`)
+
diff --git a/docs/releases.rst b/docs/releases.rst
index 1f674f6..919c60c 100644
--- a/docs/releases.rst
+++ b/docs/releases.rst
@@ -5,6 +5,7 @@
    :hidden:
    :maxdepth: 1
 
+   release-notes/release-notes-0.6.1
    release-notes/release-notes-0.6.0
    release-notes/release-notes-0.5.1
    release-notes/release-notes-0.5.0
@@ -18,6 +19,12 @@
    release-notes/release-notes-0.2.0
    release-notes/release-notes-0.1.0
 
+* **ndn-cxx version 0.6.1**
+  (:doc:`Release Notes <release-notes/release-notes-0.6.1>`, `Documentation <https://named-data.net/doc/ndn-cxx/0.6.1/>`__)
+
+  `src (git) <https://github.com/named-data/ndn-cxx/releases/tag/ndn-cxx-0.6.1>`__,
+  `src (tarball) <https://named-data.net/downloads/nfd-0.6.1.tar.bz2>`__ (`checksum <http://named-data.net/downloads/nfd-0.6.1.tar.bz2.sha256>`__)
+
 * **ndn-cxx version 0.6.0**
   (:doc:`Release Notes <release-notes/release-notes-0.6.0>`, `Documentation <https://named-data.net/doc/ndn-cxx/0.6.0/>`__)