diff --git a/net/ndnping/Portfile b/net/ndnping/Portfile
index 37dd749..65b2919 100644
--- a/net/ndnping/Portfile
+++ b/net/ndnping/Portfile
@@ -4,58 +4,33 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        cawka ndnping v0.2
-checksums           rmd160  cf4b078c08c3d28430ac8fda791579597ea05150 \
-                    sha256  d883d0c7a215f3992cdc1d573fb6b4544b438c888d98c98ffa754f60cb903568
+github.setup        named-data ndn-tlv-ping 3970fdbfc83cb580af75bd8219fefdbfee6c21d9
+checksums           rmd160  ed615a85139b448badf6dd40bf4ad4f47dba9334 \
+                    sha256  4e95e0c19ded1728fc5454903d1bdba5895812ae49d0aaca2d1e2c1f8584d44f
 
 name                ndnping
-homepage            https://github.com/NDN-Routing/ndnping
-license             GPL-2+
-version             0.2
+homepage            https://github.com/named-data/ndn-tlv-ping
+version             0.3
 
 categories          net
 platforms           darwin
 maintainers         ucla.edu:alexander.afanasyev
 
-description         ping command equivalent for NDNx
+description         NDN Ping utility (client and server)
 
-long_description    ndnpingserver and ndnping are NDNx applications used for testing connectivity 
+long_description    NDN Ping utility (client and server)
 
-depends_lib-append  port:ndnx
+depends_lib-append  port:ndn-cxx
 
-set ndnxuser        ndnx
-set ndnxgroup       ndnx
-set ndnxdir         ${prefix}/etc/ndnx
-
-patchfiles          patch-wrapper.diff
+depends_build-append    port:pkgconfig
 
 use_configure       yes
-use_autoreconf      yes
 
-configure.args-append   --with-ndn=${prefix}
-configure.env-append    OPENSSL_INCLUDES=-I${prefix}/include \
-                        OPENSSL_LDFLAGS=-L${prefix}/lib
+configure.cmd       ./waf configure
 
-pre-destroot {
-    xinstall -W ${worksrcpath} ndnping ndnpingserver ndnpingserver-wrapper ${destroot}${prefix}/bin/
-}
+build.cmd           ./waf
+build.target        build
 
-post-destroot {
-    # Create a configuration directory, which also a home directory for ${ndnxuser}
-    xinstall -d -o ${ndnxuser} -g ${ndnxgroup} "${destroot}${ndnxdir}"
-
-    system "echo /ndn/`/bin/hostname` > \"${destroot}${ndnxdir}/ndnpingserver.conf.example\""
-}
-
-notes "
-ndnpingserver needs a local prefix to be configured in ${ndnxdir}/ndnpingserver.conf
-configuration file.  This file should contain just one line with local prefix, for example: /ndn/ucla.edu
-"
-
-startupitem.executable  "${prefix}/bin/ndnpingserver-wrapper"
-
-startupitem.create      yes
-startupitem.name        ${name}
-
-startupitem.netchange   no
-startupitem.logevents   no
+destroot.cmd        ./waf
+destroot.target     install
+destroot.destdir    --destdir=${destroot}
diff --git a/net/ndnping/files/patch-wrapper.diff b/net/ndnping/files/patch-wrapper.diff
deleted file mode 100644
index 4b7de6f..0000000
--- a/net/ndnping/files/patch-wrapper.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git ndnpingserver-wrapper ndnpingserver-wrapper
-new file mode 100755
-index 0000000..c0993c8
---- /dev/null
-+++ ndnpingserver-wrapper
-@@ -0,0 +1,13 @@
-+#!/bin/sh
-+
-+# This script should be installed in the same place as ndnd, ndndc, ndndsmoketest, ...
-+# adjust the path to get consistency.
-+D=`dirname "$0"`
-+export PATH="$D:$PATH"
-+
-+if [ ! -f "$D/../etc/ndnx/ndnpingserver.conf" ]; then
-+	sleep 100
-+else
-+	su - ndnx -c "$D/ndnpingserver `cat $D/../etc/ndnx/ndnpingserver.conf | xargs`"
-+fi
-+