diff --git a/net/nfd/Portfile b/net/nfd/Portfile
index 7ee18d0..6a82fbc 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 3b21fa3258a276371cbbf9712a55c18de4a22ced
-checksums           rmd160  a00cef6055e5a120ba1e54bb7e9f632ac89576fd \
-                    sha256  7083a7b1c158a356ea7d1bbc5709229da7db009b090077c9ab4774c28ad525a3
+github.setup        named-data NFD c5173de511316987c873a3f0ce348db309f7b9ea
+checksums           rmd160  0b5d70beabf5cf89ca60a4f82d77e2ecc7f5dbd5 \
+                    sha256  a35c346c825d9717b2947e0e30b8fd376c92523e1521ed0a2bb6507a687a1ba8
 
 name                nfd
 homepage            http://named-data.net/doc/NFD/
 license             GPL3+
-version             0.2.0-0
+version             0.3.0-rc0.0
 epoch               2
 
 categories          net
@@ -42,11 +42,12 @@
 
 pre-configure {
     system "cd ${worksrcpath} && \
-            curl -L https://github.com/zaphoyd/websocketpp/tarball/65cc3765a892ee5928160ba478178e747233aa6c > websocket.tar.gz && \
+            curl -L https://github.com/zaphoyd/websocketpp/tarball/4309749dd98937b8a7be5dc0bfe679ba201c5512 > websocket.tar.gz && \
             tar zxf websocket.tar.gz -C websocketpp/ --strip 1"
 }
 
 configure.env-append    SPHINX_BUILD=${prefix}/bin/sphinx-build-2.7
+configure.cxxflags-append -std=c++11
 configure.cmd           ./waf configure
 
 build.cmd           ./waf
diff --git a/net/nfd/files/nfd.conf.sample b/net/nfd/files/nfd.conf.sample
index 1dd99c4..ecc8e3c 100644
--- a/net/nfd/files/nfd.conf.sample
+++ b/net/nfd/files/nfd.conf.sample
@@ -36,13 +36,31 @@
   ; Forwarder INFO
 }
 
+; The tables section configures the CS, PIT, FIB, Strategy Choice, and Measurements
+tables
+{
+
+  ; ContentStore size limit in number of packets
+  ; default is 65536, about 500MB with 8KB packet size
+  cs_max_packets 65536
+
+  ; Set the forwarding strategy for the specified prefixes:
+  ;   <prefix> <strategy>
+  strategy_choice
+  {
+    /               /localhost/nfd/strategy/best-route
+    /localhost      /localhost/nfd/strategy/broadcast
+    /localhost/nfd  /localhost/nfd/strategy/best-route
+    /ndn/broadcast  /localhost/nfd/strategy/broadcast
+  }
+}
+
 ; The face_system section defines what faces and channels are created.
 face_system
 {
   ; The unix section contains settings of UNIX stream faces and channels.
   unix
   {
-    listen yes ; set to 'no' to disable UNIX stream listener, default 'yes'
     path /var/run/nfd.sock ; UNIX stream listener path
   }
 
@@ -195,4 +213,15 @@
   ;   ;   file-name keys/ndn-testbed.ndncert
   ;   ; }
   ; }
+
+  remote_register
+  {
+    cost 15 ; forwarding cost of prefix registered on remote router
+    timeout 10000 ; timeout (in milliseconds) of remote prefix registration command
+    retry 0 ; maximum number of retries for each remote prefix registration command
+
+    refresh_interval 300 ; interval (in seconds) before refreshing the registration
+    ; This setting should be less than face_system.udp.idle_time,
+    ; so that the face is kept alive on the remote router.
+  }
 }