diff --git a/docs/release-notes/release-notes-0.4.0.rst b/docs/release-notes/release-notes-0.4.0.rst
index 1641b3e..725894e 100644
--- a/docs/release-notes/release-notes-0.4.0.rst
+++ b/docs/release-notes/release-notes-0.4.0.rst
@@ -1,7 +1,7 @@
 NFD version 0.4.0
 -----------------
 
-Release date: TBD
+Release date: December 31, 2015
 
 .. note::
    Version 0.4.0 introduces several breaking changes to API and wire format of management protocols
@@ -11,15 +11,18 @@
 New features:
 ^^^^^^^^^^^^^
 
-- **(breaking change)** Refactored implementation of face system (:issue:`3088`,
-  :issue:`3104`, :issue:`3165`, :issue:`3168`, :issue:`3225`, :issue:`3226`, :issue:`3253`)
+- **(breaking change)** Refactored implementation of face system (:issue:`3088`, :issue:`3104`,
+  :issue:`3165`, :issue:`3168`, :issue:`3225`, :issue:`3226`, :issue:`3253`, :issue:`3259`,
+  :issue:`3169`, :issue:`3160`, :issue:`3278`, :issue:`3166`, :issue:`3177`, :issue:`3177`,
+  :issue:`3172`)
 
   The abstraction to send/receive NDN packets has been split into Transport, LinkService, and Face:
 
   * *Transport* provides delivery of the data blocks over specific underlying channels
     (raw ethernet packets, unicast/multicast UDP datagrams, TCP and WebSocket streams)
 
-    Implemented: :NFD:`UnixStreamTransport`, :NFD:`UnicastUdpTransport`, :NFD:`MulticastUdpTransport`,
+    Implemented: :NFD:`UnixStreamTransport`, :NFD:`EthernetTransport`, :NFD:`UnicastUdpTransport`,
+    :NFD:`MulticastUdpTransport`, :NFD:`WebSocketTransport`, :NFD:`TcpTransport`,
     :NFD:`InternalForwarderTransport`
 
   * *LinkService* provides an "adaptation" layer to translate between NDN packets and data
@@ -41,6 +44,7 @@
   :issue:`2520`, :issue:`2763`, :issue:`2841`)
 
   * Network NACK (:issue:`2883`)
+  * Fragmentation and reassembly  (:issue:`3171`)
 
 - Networking NACK in pipelines and best-route strategy (:issue:`3156`)
 
@@ -54,6 +58,9 @@
 
 - Full support for UDP permanent faces (:issue:`2993`, :issue:`2989`, :issue:`3018`)
 
+- Automatic start of NDN auto-configuration client (``ndn-autoconfig``) when starting NFD
+  using ``nfd-start``, when enabled in ``autoconfig.conf`` (:issue:`2716`)
+
 Updates and bug fixes:
 ^^^^^^^^^^^^^^^^^^^^^^
 
@@ -65,6 +72,12 @@
   * ``rib.remote_register`` section has been removed and, if present, will cause failure for NFD to start
   * ``rib.auto_prefix_propagate`` section has been added to control automatic prefix propagation feature
 
+- Adapt pcap filter in EthernetTransport to accept only untagged frames (:issue:`3348`)
+
+- Increase the initial suppression interval in BestRouteStrategy2 to 250ms (:issue:`3230`)
+
+- Fix potential crash in ``Measurements::get(Fib::s_emptyEntry)`` (:issue:`3275`)
+
 - Fix memory leak in PriorityFifoPolicy (:issue:`3236`)
 
 - Display extended information for fatal NFD errors (:issue:`2541`)
@@ -74,24 +87,26 @@
 - Properly handle exception from NetworkMonitor when the platform doesn't support it
   (:issue:`3195`)
 
+- Multiple test suite improvements (:issue:`3322`, :issue:`3306`, :issue:`3305`, :issue:`3307`,
+  :issue:`3346`, :issue:`3327`)
+
 Deprecated:
 ^^^^^^^^^^^
 
 - BroadcastStrategy (``/localhost/nfd/strategy/broadcast``) renamed as MulticastStrategy
   (``/localhost/nfd/strategy/multicast``) (:issue:`3011`)
 
+- ForwarderStatus dataset retrievable using ``/localhost/nfd/status`` name, use
+  ``/localhost/nfd/status/general`` instead.
+
 Deleted:
 ^^^^^^^^
 
 - NotificationStream, replaced by the version in ndn-cxx library (:issue:`2144`)
 
+Known issues:
+^^^^^^^^^^^^^
 
-Planned features for future releases:
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-- Improvements and extension of NDNLPv2 support
-
-  * New transports
-  * New link service implementation, including support for fragmentation and assembly
-
-- Improved support for automatic prefix propagation (:issue:`3211`, :issue:`2413`)
+- NFD currently has a known limitation in supporting the retrieval of data using full names,
+  i.e., names with the implicit digest (:issue:`3363`).  This limitation will be addressed
+  in the next release.
diff --git a/wscript b/wscript
index 4b0ca05..cef5b2d 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.3.92"
+VERSION = "0.4.0"
 APPNAME = "nfd"
 BUGREPORT = "http://redmine.named-data.net/projects/nfd"
 URL = "http://named-data.net/doc/NFD/"