diff --git a/docs/manpages/nfdc-strategy.rst b/docs/manpages/nfdc-strategy.rst
index a9f6886..2a6c41a 100644
--- a/docs/manpages/nfdc-strategy.rst
+++ b/docs/manpages/nfdc-strategy.rst
@@ -23,12 +23,12 @@
 The **nfdc strategy show** command shows the effective strategy choice for a specific name.
 
 The **nfdc strategy set** command sets the strategy for a name prefix.
-The strategy for ``/'' prefix is the default strategy.
+The strategy for ``"/"`` prefix is the default strategy.
 
 The **nfdc strategy unset** command clears the strategy choice at a name prefix,
 so that a strategy choice at a shorter prefix or the default strategy will be used.
 It undoes a prior **nfdc strategy set** command on the same name prefix.
-It is prohibited to unset the strategy choice for ``/'' prefix because there must always be a
+It is prohibited to unset the strategy choice for ``"/"`` prefix because there must always be a
 default strategy.
 
 OPTIONS
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.6.1.rst b/docs/release-notes/release-notes-0.6.1.rst
new file mode 100644
index 0000000..9339172
--- /dev/null
+++ b/docs/release-notes/release-notes-0.6.1.rst
@@ -0,0 +1,50 @@
+NFD version 0.6.1
+-----------------
+
+Release date: February 19, 2018
+
+New features:
+^^^^^^^^^^^^^
+
+- (potentially breaking change) ``nfd-status-http-server`` now requires Python 3
+
+- Congestion detection and signaling for TCP, UDP, and Unix stream transports. This feature
+  can be managed through the configuration file and nfdc, and is enabled by default
+  (:issue:`4362`, :issue:`4465`)
+
+- ``nfdc cs info`` command that shows CS hits and CS misses
+  (:issue:`4219`, :issue:`4438`)
+
+- Support for non-listening UDP channels (:issue:`4098`)
+
+- IPv6 UDP multicast transport (:issue:`4222`)
+
+- Strategy notification for packet drops in ``LpReliability`` (:issue:`3823`)
+
+- ``NonDiscovery`` and ``PrefixAnnouncement`` encoding/decoding in ``GenericLinkService``
+  (:issue:`4280`, :issue:`4355`)
+
+Improvements and bug fixes
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Added more ways in ``nfdc`` for a user to ask for help, including ``'nfdc foo help'``, ``'nfdc foo
+  --help'``, and ``'nfdc foo -h'`` (:issue:`4503`)
+
+- Added privilege elevation in ``MulticastUdpTransport`` that was preventing NFD from running with
+  effective non-root user (:issue:`4507`)
+
+- Fixed crash when configuration file lacks an ``'authorizations'`` section
+  (:issue:`4487`)
+
+- Made the exit status consistent across all tools
+
+- Fixed build when ``std::to_string`` is not available
+  (:issue:`4393`)
+
+- Made ``AsfStrategy`` less sensitive, switching the path only after multiple timeouts. The number
+  of timeouts is configurable via a strategy parameter (:issue:`4193`)
+
+- Introduce depth limit in the Measurements table, limit the accepted prefix length for RIB,
+  FIB, and StrategyChoice management commands (:issue:`4262`)
+
+- Improved test cases and documentation
diff --git a/docs/releases.rst b/docs/releases.rst
index 4fb2512..f2901ae 100644
--- a/docs/releases.rst
+++ b/docs/releases.rst
@@ -5,6 +5,8 @@
    :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 +20,12 @@
    release-notes/release-notes-0.2.0
    release-notes/release-notes-0.1.0
 
+* **NFD version 0.6.1**
+  (:doc:`Release Notes <release-notes/release-notes-0.6.1>`, `Documentation <https://named-data.net/doc/NFD/0.6.1/>`__)
+
+  `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.6.1>`__,
+  `src (tarball) <https://named-data.net/downloads/nfd-0.6.1.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.6.1.tar.bz2.sha256>`__)
+
 * **NFD version 0.6.0**
   (:doc:`Release Notes <release-notes/release-notes-0.6.0>`, `Documentation <https://named-data.net/doc/NFD/0.6.0/>`__)
 
diff --git a/wscript b/wscript
index 74b83f9..9b2a76a 100644
--- a/wscript
+++ b/wscript
@@ -24,7 +24,7 @@
 NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-VERSION = "0.6.0"
+VERSION = "0.6.1"
 APPNAME = "nfd"
 BUGREPORT = "https://redmine.named-data.net/projects/nfd"
 URL = "https://named-data.net/doc/NFD/"