diff --git a/net/ndn-tools/Portfile b/net/ndn-tools/Portfile
new file mode 100644
index 0000000..0c839c8
--- /dev/null
+++ b/net/ndn-tools/Portfile
@@ -0,0 +1,38 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem          1.0
+PortGroup           github 1.0
+
+github.setup        named-data ndn-tools 6eff4e56534b3998515b35ca25b3db39bb7aaa3e
+checksums           rmd160  b4c3d45e0662ab9ad4a86a019c8d18890a409716 \
+                    sha256  518de79810fc1b6f651027ef6df22cd48e320b91e516e2ca207e99cae3da3d90
+
+name                ndn-tools
+homepage            https://github.com/named-data/ndndump
+version             0.0.0-g6eff4e5
+license             GPL3+
+
+categories          net
+platforms           darwin
+maintainers         ucla.edu:alexander.afanasyev
+
+description         ndn-tools is a collection of essential tools for Named Data Networking. \
+                    These tools are recommended to be installed on all NDN nodes.
+
+depends_lib-append  port:ndn-cxx \
+                    port:libpcap
+
+depends_build-append    port:pkgconfig
+
+use_configure       yes
+
+configure.cxxflags-append -std=c++11
+configure.cmd       ./waf configure
+
+build.cmd           ./waf
+build.target        build
+
+destroot.cmd        ./waf
+destroot.target     install
+destroot.destdir    --destdir=${destroot}
diff --git a/net/ndndump/Portfile b/net/ndndump/Portfile
index d2b79b2..53ecd76 100644
--- a/net/ndndump/Portfile
+++ b/net/ndndump/Portfile
@@ -2,37 +2,14 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           github 1.0
-
-github.setup        named-data ndndump 0ce60362a285f42cf2ecbeea8cff0c7919d28d72
-checksums           rmd160  85958ac36faa660b3735b76d0d05e5ebc2e30a9e \
-                    sha256  6d13147dcdfb36f0c281b12a99a6df9e56088ac1034e1bbc3b507be6e82061e4
+PortGroup           obsolete 1.0
 
 name                ndndump
-homepage            https://github.com/named-data/ndndump
-version             0.5.2
+version             0.6-deprecated
 license             GPL3+
 revision            2
 
+replaced_by         ndn-tools
+
 categories          net
 platforms           darwin
-maintainers         ucla.edu:alexander.afanasyev
-
-description         Packet capture and analysis tool for NDN
-
-depends_lib-append  port:ndn-cxx \
-                    port:libpcap
-
-depends_build-append    port:pkgconfig
-
-use_configure       yes
-
-configure.cxxflags-append -std=c++11
-configure.cmd       ./waf configure
-
-build.cmd           ./waf
-build.target        build
-
-destroot.cmd        ./waf
-destroot.target     install
-destroot.destdir    --destdir=${destroot}
diff --git a/net/ndnping/Portfile b/net/ndnping/Portfile
index 93a8487..82202a4 100644
--- a/net/ndnping/Portfile
+++ b/net/ndnping/Portfile
@@ -2,39 +2,14 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           github 1.0
-
-github.setup        named-data ndn-tlv-ping d3675f528af468d59b2c505057acd21b56210c5c
-checksums           rmd160  5a3d9c33f7455b2f03c45a7cfdf1e341b5389bab \
-                    sha256  6e4be27a40da0270c814dc706b2bbe100630fa95cabc901f7fe7e1d8e138e50a
+PortGroup           obsolete 1.0
 
 name                ndnping
-homepage            https://github.com/named-data/ndn-tlv-ping
-version             0.1.5
+version             0.2-deprecated
 license             GPL3+
 epoch               1
 
+replaced_by         ndn-tools
+
 categories          net
 platforms           darwin
-maintainers         ucla.edu:alexander.afanasyev
-
-description         NDN Ping utility (ndn-tlv-ping)
-
-long_description    NDN Ping utility (client and server)
-
-depends_lib-append  port:ndn-cxx
-
-depends_build-append    port:pkgconfig
-
-use_configure       yes
-
-configure.cxxflags-append -std=c++11
-configure.env-append PKG_CONFIG_PATH=${prefix}/lib/pkgconfig
-configure.cmd       ./waf configure
-
-build.cmd           ./waf
-build.target        build
-
-destroot.cmd        ./waf
-destroot.target     install
-destroot.destdir    --destdir=${destroot}