diff --git a/net/nfd/Portfile b/net/nfd/Portfile
index 2426414..b1af60e 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 NFD-0.3.1
-checksums           rmd160  5971a2be0cc4f734947a011a31259fea4ddbe5df \
-                    sha256  a45a1196ac1929cc71b10ff279d56aebb1b07f7505787999af5b2dd36c321620
+github.setup        named-data NFD NFD-0.3.2
+checksums           rmd160  3e6890104286046251f08a818493228cdef851a2 \
+                    sha256  5633a84f97ad293dedd1ded3a87554826c8f7be206a5de03860da3c66768c487
 
 name                nfd
 homepage            http://named-data.net/doc/NFD/
 license             GPL3+
-version             0.3.1
+version             0.3.2
 epoch               3
 
 categories          net
@@ -42,7 +42,7 @@
 
 pre-configure {
     system "cd ${worksrcpath} && \
-            curl -L https://github.com/zaphoyd/websocketpp/tarball/4309749dd98937b8a7be5dc0bfe679ba201c5512 > websocket.tar.gz && \
+            curl -L https://github.com/zaphoyd/websocketpp/tarball/ac5d7ea5af9734de965688b54a7860259887b537 > websocket.tar.gz && \
             tar zxf websocket.tar.gz -C websocketpp/ --strip 1"
 }
 
@@ -69,13 +69,9 @@
     xinstall -m 755 -d ${destroot}${prefix}/etc/LaunchDaemons/net.named-data.nfd/
     xinstall -m 755 ${filespath}/net.named-data.nfd.plist \
         ${destroot}${prefix}/etc/LaunchDaemons/net.named-data.nfd/
-    xinstall -m 755 ${filespath}/net.named-data.nrd.plist \
-        ${destroot}${prefix}/etc/LaunchDaemons/net.named-data.nfd/
 
     reinplace "s|/usr/local|${prefix}|g" \
         ${destroot}${prefix}/etc/LaunchDaemons/net.named-data.nfd/net.named-data.nfd.plist
-    reinplace "s|/usr/local|${prefix}|g" \
-        ${destroot}${prefix}/etc/LaunchDaemons/net.named-data.nfd/net.named-data.nrd.plist
 
     # Install replacement for nfd-start/stop scripts
     xinstall -m 755 ${filespath}/nfd-start "${destroot}${prefix}/bin/"
@@ -90,8 +86,6 @@
 
     system "cd /Library/LaunchDaemons && sudo ln -sf \
             ${prefix}/etc/LaunchDaemons/net.named-data.nfd/net.named-data.nfd.plist"
-    system "cd /Library/LaunchDaemons && sudo ln -sf \
-            ${prefix}/etc/LaunchDaemons/net.named-data.nfd/net.named-data.nrd.plist"
 
     if {![file exists ${prefix}/etc/ndn/nfd.conf]} {
 
@@ -104,19 +98,11 @@
         system "HOME=${prefix}/var/lib/ndn/nfd ndnsec-keygen /localhost/daemons/nfd | \
           HOME=${prefix}/var/lib/ndn/nfd ndnsec-install-cert -"
 
-        # Generate self-signed NDN certificate for nrd (owned by ndn)
-        xinstall -m 755 -d -o ${ndn_user} -g ${ndn_group} ${prefix}/var/lib/ndn/nrd/.ndn
-        system "sudo -u ${ndn_user} -g ${ndn_group} sh -c 'echo tpm=file \
-          > ${prefix}/var/lib/ndn/nrd/.ndn/client.conf'"
-        system "sudo -u ${ndn_user} -g ${ndn_group} HOME=${prefix}/var/lib/ndn/nrd \
-          ndnsec-keygen /localhost/daemons/nrd | \
-          sudo -u ${ndn_user} -g ndn HOME=${prefix}/var/lib/ndn/nrd ndnsec-install-cert -"
-
         # Dump RIB Management daemon's certificate
         xinstall -m 755 -d ${prefix}/etc/ndn/certs
-        system "sudo sh -c 'sudo -u ${ndn_user} -g ${ndn_group} HOME=${prefix}/var/lib/ndn/nrd \
-          ndnsec-dump-certificate -i /localhost/daemons/nrd \
-          > ${prefix}/etc/ndn/certs/localhost_daemons_nrd.ndncert'"
+        system "sudo sh -c 'sudo -u ${ndn_user} -g ${ndn_group} HOME=${prefix}/var/lib/ndn/nfd \
+          ndnsec-dump-certificate -i /localhost/daemons/nfd \
+          > ${prefix}/etc/ndn/certs/localhost_daemons_nfd.ndncert'"
 
     }
 }
@@ -125,7 +111,6 @@
     system "${prefix}/bin/nfd-stop"
 
     system "rm ${prefix}/etc/LaunchDaemons/net.named-data.nfd/net.named-data.nfd.plist"
-    system "rm ${prefix}/etc/LaunchDaemons/net.named-data.nfd/net.named-data.nrd.plist"
 }
 
 notes "
diff --git a/net/nfd/files/net.named-data.nrd.plist b/net/nfd/files/net.named-data.nrd.plist
deleted file mode 100644
index 3cd7aaa..0000000
--- a/net/nfd/files/net.named-data.nrd.plist
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
-"http://www.apple.com/DTDs/PropertyList-1.0.dtd" >
-<plist version='1.0'>
-<dict>
-<key>Label</key><string>net.named-data.nrd</string>
-<key>ProgramArguments</key>
-<array>
-  <string>/usr/local/bin/nrd</string>
-  <string>--config</string>
-  <string>/usr/local/etc/ndn/nfd.conf</string>
-</array>
-<key>UserName</key><string>ndn</string>
-<key>GroupName</key><string>ndn</string>
-<key>EnvironmentVariables</key>
-<dict>
-  <key>HOME</key><string>/usr/local/var/lib/ndn/nrd</string>
-</dict>
-<key>Debug</key><true/>
-<key>Disabled</key><true/>
-<key>KeepAlive</key><true/>
-<key>StandardErrorPath</key><string>/usr/local/var/log/ndn/nrd.log</string>
-<key>ProcessType</key><string>Background</string>
-</dict>
-</plist>
diff --git a/net/nfd/files/nfd-start b/net/nfd/files/nfd-start
index af1853f..32552dc 100755
--- a/net/nfd/files/nfd-start
+++ b/net/nfd/files/nfd-start
@@ -1,4 +1,3 @@
 #!/bin/sh
 
 sudo launchctl load -w /Library/LaunchDaemons/net.named-data.nfd.plist
-sudo launchctl load -w /Library/LaunchDaemons/net.named-data.nrd.plist
diff --git a/net/nfd/files/nfd-stop b/net/nfd/files/nfd-stop
index 2d64e9f..df40500 100755
--- a/net/nfd/files/nfd-stop
+++ b/net/nfd/files/nfd-stop
@@ -1,4 +1,3 @@
 #!/bin/sh
 
 sudo launchctl unload -w /Library/LaunchDaemons/net.named-data.nfd.plist
-sudo launchctl unload -w /Library/LaunchDaemons/net.named-data.nrd.plist
diff --git a/net/nfd/files/nfd.conf.sample b/net/nfd/files/nfd.conf.sample
index dff5931..77808b5 100644
--- a/net/nfd/files/nfd.conf.sample
+++ b/net/nfd/files/nfd.conf.sample
@@ -26,7 +26,6 @@
   ;
   ; Run:
   ;   nfd --modules
-  ;   nrd --modules
   ;
   ; Or look for NFD_LOG_INIT(<module name>) statements in .cpp files
   ;
@@ -116,7 +115,7 @@
 {
   authorize
   {
-    certfile certs/localhost_daemons_nrd.ndncert
+    certfile certs/localhost_daemons_nfd.ndncert
     privileges
     {
         faces