diff --git a/ndnmap-data-collector/Makefile b/ndnmap-data-collector/Makefile
index bd4a41a..3f4c3be 100644
--- a/ndnmap-data-collector/Makefile
+++ b/ndnmap-data-collector/Makefile
@@ -2,15 +2,15 @@
 GIT_URL=https://github.com/WU-ARL/ndnmapDataCollector
 
 # Tag name or commit hash for checkout
-GIT_VERSION=3785a75abf04176e9e5a7f2642a1e11f31c87bdd
+GIT_VERSION=66d2a5b956b686e591d9b773bc1b8ad9331cf2e3
 
 # Package name
 NAME=ndnmap-data-collector
 
 # Package version
-VERSION=0.1.0-1
+VERSION=0.1.0-3-g66d2a5
 
 # PPA version
-PPA_VERSION=4
+PPA_VERSION=1
 
 include ../packaging.mk
diff --git a/ndnmap-data-collector/debian/changelog b/ndnmap-data-collector/debian/changelog
index a4698e6..d4738f9 100644
--- a/ndnmap-data-collector/debian/changelog
+++ b/ndnmap-data-collector/debian/changelog
@@ -1,3 +1,24 @@
+ndnmap-data-collector (0.1.0-3-g66d2a5-ppa1~DISTRO) DISTRO; urgency=low
+
+  * New version based on 66d2a5b956b686e591d9b773bc1b8ad9331cf2e3
+    (https://github.com/WU-ARL/ndnmapDataCollector)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Fri, 09 Dec 2016 13:02:08 +0000
+
+ndnmap-data-collector (0.1.0-2-ge2e25-ppa1~DISTRO) DISTRO; urgency=low
+
+  * New version based on e2e251ac27be8869fc62fc195db1b8a698b1aff6
+    (https://github.com/cawka/ndnmapDataCollector)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Wed, 05 Oct 2016 06:21:10 +0000
+
+ndnmap-data-collector (0.1.0-1-ppa5~DISTRO) DISTRO; urgency=low
+
+  * New version based on 3785a75abf04176e9e5a7f2642a1e11f31c87bdd
+    (https://github.com/WU-ARL/ndnmapDataCollector)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Wed, 05 Oct 2016 05:58:33 +0000
+
 ndnmap-data-collector (0.1.0-1-ppa4~DISTRO) DISTRO; urgency=low
 
   * New version based on 3785a75abf04176e9e5a7f2642a1e11f31c87bdd
diff --git a/ndnmap-data-collector/debian/control b/ndnmap-data-collector/debian/control
index 3cc2913..2613196 100644
--- a/ndnmap-data-collector/debian/control
+++ b/ndnmap-data-collector/debian/control
@@ -5,7 +5,7 @@
  dh-systemd (>= 1.5),
  python (>= 2.7.0),
  pkg-config (>= 0.26),
- ndn-cxx-dev (>= 0.4.1)
+ ndn-cxx-dev (>= 0.5.0)
 Standards-Version: 3.9.2
 Section: net
 Homepage: http://github.com/WU-ARL/ndnmapDataCollector
diff --git a/ndnmap-data-collector/debian/control.precise b/ndnmap-data-collector/debian/control.precise
deleted file mode 100644
index 5485c16..0000000
--- a/ndnmap-data-collector/debian/control.precise
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: ndnmap-data-collector
-Priority: extra
-Maintainer: John DeHart <jdd@wustl.edu>
-Build-Depends: debhelper (>= 8.0.0),
- python (>= 2.7.0),
- pkg-config (>= 0.26),
- ndn-cxx-dev (>= 0.4.1)
-Standards-Version: 3.9.2
-Section: net
-Homepage: http://github.com/WU-ARL/ndnmapDataCollector
-Vcs-Git: git://github.com/WU-ARL/ndnmapDataCollector.git
-Vcs-Browser: http://github.com/WU-ARL/ndnmapDataCollector
-
-Package: ndnmap-data-collector
-Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ndn-cxx
-Description: Data collector daemons for ndnmap.arl.wustl.edu
- This tool is designed to generate ndn interests to each NDN Testbed node
- to collect link usage data for display on the ndnmap.arl.wustl.edu web page.
diff --git a/ndnmap-data-collector/debian/copyright b/ndnmap-data-collector/debian/copyright
index 1053c50..a8fce47 100644
--- a/ndnmap-data-collector/debian/copyright
+++ b/ndnmap-data-collector/debian/copyright
@@ -7,27 +7,19 @@
 License: Unknown
 
 Files: debian/*
-Copyright: Copyright (c) 2013-2014, Alexander Afanasyev <alexander.afanasyev@ucla.edu>
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-     * Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-     * Neither the name of the Regents of the University of California nor
-       the names of its contributors may be used to endorse or promote
-       products derived from this software without specific prior written
-       permission.
+Copyright: Copyright (c) 2013-2016, Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+License: Apache 2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
  .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL REGENTS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License 2.0 can
+ be found in "/usr/share/common-licenses/Apache-2.0"
diff --git a/ndnmap-data-collector/debian/rules.precise b/ndnmap-data-collector/debian/rules.precise
deleted file mode 100755
index 5fa0a0c..0000000
--- a/ndnmap-data-collector/debian/rules.precise
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
-CXXFLAGS += -std=c++0x
-
-%:
-	dh $@ --parallel
-
-override_dh_auto_configure:
-	CXXFLAGS="$(CXXFLAGS)" LINKFLAGS="$(LDFLAGS)" ./waf configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-
-override_dh_auto_build:
-	./waf build
-
-override_dh_auto_install:
-	./waf install --destdir=debian/tmp
-
-override_dh_auto_clean:
-	./waf distclean
-
-override_dh_clean:
-	dh_clean
-	./waf distclean
-	rm -rf .waf-1*
-	rm -rf .waf3-1*
-	rm -f .waf-tools/*.pyc
-
-override_dh_auto_test: