diff --git a/net/nfd/Portfile b/net/nfd/Portfile
index 6a82fbc..c35c9ca 100644
--- a/net/nfd/Portfile
+++ b/net/nfd/Portfile
@@ -4,14 +4,14 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        named-data NFD c5173de511316987c873a3f0ce348db309f7b9ea
-checksums           rmd160  0b5d70beabf5cf89ca60a4f82d77e2ecc7f5dbd5 \
-                    sha256  a35c346c825d9717b2947e0e30b8fd376c92523e1521ed0a2bb6507a687a1ba8
+github.setup        named-data NFD b283128b6f78b1c00ad9576913dbc4c8df76bf06
+checksums           rmd160  98f14fdf35c005101c76360733c95dd174780ffd \
+                    sha256  d29d1349cd3799002f3291ea42da2c77d51b61bc9ba2ec5f68efab462ffac0f0
 
 name                nfd
 homepage            http://named-data.net/doc/NFD/
 license             GPL3+
-version             0.3.0-rc0.0
+version             0.3.0-rc0.1
 epoch               2
 
 categories          net
diff --git a/net/nfd/files/nfd.conf.sample b/net/nfd/files/nfd.conf.sample
index ecc8e3c..dff5931 100644
--- a/net/nfd/files/nfd.conf.sample
+++ b/net/nfd/files/nfd.conf.sample
@@ -59,6 +59,8 @@
 face_system
 {
   ; The unix section contains settings of UNIX stream faces and channels.
+  ; Unix channel is always listening; delete unix section to disable
+  ; Unix stream faces and channels.
   unix
   {
     path /var/run/nfd.sock ; UNIX stream listener path
@@ -90,17 +92,24 @@
     mcast_group 224.0.23.170 ; UDP multicast group (IPv4 only)
   }
 
-  ; Note:
-  ; Ethernet face support is currently broken in OSX with boost 1.56
-  ;
-  ; ; The ether section contains settings of Ethernet faces and channels.
-  ; ether
-  ; {
-  ;   ; Ethernet multicast settings
-  ;   ; NFD creates one Ethernet multicast face per NIC
-  ;   mcast yes ; set to 'no' to disable Ethernet multicast, default 'yes'
-  ;   mcast_group 01:00:5E:00:17:AA ; Ethernet multicast group
-  ; }
+  ; The ether section contains settings of Ethernet faces and channels.
+  ether
+  {
+    ; Ethernet multicast settings
+    ; NFD creates one Ethernet multicast face per NIC
+    mcast yes ; set to 'no' to disable Ethernet multicast, default 'yes'
+    mcast_group 01:00:5E:00:17:AA ; Ethernet multicast group
+  }
+
+  ; The websocket section contains settings of WebSocket faces and channels.
+
+  websocket
+  {
+    listen yes ; set to 'no' to disable WebSocket listener, default 'yes'
+    port 9696 ; WebSocket listener port number
+    enable_v4 yes ; set to 'no' to disable listening on IPv4 socket, default 'yes'
+    enable_v6 yes ; set to 'no' to disable listening on IPv6 socket, default 'yes'
+  }
 }
 
 authorizations