diff --git a/ndn-cxx/Makefile b/ndn-cxx/Makefile
index 6e635bc..e827a96 100644
--- a/ndn-cxx/Makefile
+++ b/ndn-cxx/Makefile
@@ -2,15 +2,15 @@
 GIT_URL=https://github.com/named-data/ndn-cxx.git
 
 # Tag name or commit hash for checkout
-GIT_VERSION=5b323d16c883410a8e2a769dff65e81fc1a28fb7
+GIT_VERSION=ndn-cxx-0.6.1
 
 # Package name
 NAME=ndn-cxx
 
 # Package version
-VERSION=0.6.0-40-g5b323d16
+VERSION=0.6.1
 
 # PPA version
-PPA_VERSION=1
+PPA_VERSION=2
 
 include ../packaging.mk
diff --git a/ndn-cxx/debian/changelog b/ndn-cxx/debian/changelog
index 83e4db9..76df4b4 100644
--- a/ndn-cxx/debian/changelog
+++ b/ndn-cxx/debian/changelog
@@ -1,3 +1,18 @@
+ndn-cxx (0.6.1-ppa2~DISTRO) DISTRO; urgency=low
+
+  * Upgrade to 0.6.1 and fixe naming convention for the library
+    packages. Version based on ndn-cxx-0.6.1 (https://github.com/named-
+    data/ndn-cxx.git)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Thu, 22 Feb 2018 16:31:22 +0000
+
+ndn-cxx (0.6.1-ppa1~DISTRO) DISTRO; urgency=low
+
+  * Version based on ndn-cxx-0.6.1 (https://github.com/named-data/ndn-
+    cxx.git)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Thu, 22 Feb 2018 16:10:36 +0000
+
 ndn-cxx (0.6.0-40-g5b323d16-ppa1~DISTRO) DISTRO; urgency=low
 
   * New version based on 5b323d16c883410a8e2a769dff65e81fc1a28fb7
diff --git a/ndn-cxx/debian/control b/ndn-cxx/debian/control
index abb47c7..c8cf1f9 100644
--- a/ndn-cxx/debian/control
+++ b/ndn-cxx/debian/control
@@ -6,7 +6,6 @@
  pkg-config (>= 0.26),
  libssl-dev (>=1.0.1),
  libsqlite3-dev (>= 3.7.9),
- libcrypto++-dev (>= 5.6.1),
  python-sphinx (>= 1.1.3),
  libboost-all-dev (>= 1.53.0)
 Standards-Version: 3.9.2
@@ -15,30 +14,35 @@
 Vcs-Git: git://github.com/named-data/ndn-cxx.git
 Vcs-Browser: http://github.com/named-data/ndn-cxx
 
-Package: ndn-cxx-dev
+Package: libndn-cxx-dev
 Section: libdevel
 Architecture: i386 amd64 arm64 armel armhf ppc64el
 Depends: python (>= 2.7.0),
  pkg-config (>= 0.26),
  libssl-dev (>=1.0.1),
  libsqlite3-dev (>= 3.7.9),
- libcrypto++-dev (>= 5.6.1),
  libboost-all-dev (>= 1.53.0),
- ndn-cxx (= ${binary:Version})
+ libndn-cxx (= ${binary:Version})
 Description: Development headers and libraries of NDN C++ library with eXperimental eXtensions
 
-Package: ndn-cxx
+Package: libndn-cxx
 Section: libs
 Architecture: i386 amd64 arm64 armel armhf ppc64el
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: NDN C++ library with eXperimental eXtensions and security tools
-Conflicts: ndn.cxx-security-tools
+Description: NDN C++ library with eXperimental eXtensions
 
-Package: ndn-cxx-dbg
+Package: libndn-cxx-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends:
- ndn-cxx (= ${binary:Version}),
+ libndn-cxx (= ${binary:Version}),
  ${misc:Depends}
 Description: debugging symbols for ndn-cxx
+
+Package: ndnsec
+Section: libs
+Architecture: i386 amd64 arm64 armel armhf ppc64el
+Depends: libndn-cxx (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: NDN security tools
+Conflicts: ndn.cxx-security-tools
diff --git a/ndn-cxx/debian/copyright b/ndn-cxx/debian/copyright
index 7d15d92..799321a 100644
--- a/ndn-cxx/debian/copyright
+++ b/ndn-cxx/debian/copyright
@@ -3,7 +3,7 @@
 Source: http://github.com/named-data/ndn-cxx
 
 Files: *
-Copyright:  Copyright (c) 2013-2016 Regents of the University of California.
+Copyright:  Copyright (c) 2013-2018 Regents of the University of California.
 License: LGPL-3+
  ndn-cxx library is free software: you can redistribute it and/or modify it under the
  terms of the GNU Lesser General Public License as published by the Free Software
@@ -20,7 +20,7 @@
  See AUTHORS.md of ndn-cxx source for complete list of ndn-cxx authors and contributors.
 
 Files: debian/*
-Copyright: 2013-2016, Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+Copyright: 2013-2018, 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.
diff --git a/ndn-cxx/debian/ndn-cxx-dev.dirs b/ndn-cxx/debian/libndn-cxx-dev.dirs
similarity index 100%
rename from ndn-cxx/debian/ndn-cxx-dev.dirs
rename to ndn-cxx/debian/libndn-cxx-dev.dirs
diff --git a/ndn-cxx/debian/ndn-cxx-dev.install b/ndn-cxx/debian/libndn-cxx-dev.install
similarity index 72%
rename from ndn-cxx/debian/ndn-cxx-dev.install
rename to ndn-cxx/debian/libndn-cxx-dev.install
index 9b90213..19403ad 100644
--- a/ndn-cxx/debian/ndn-cxx-dev.install
+++ b/ndn-cxx/debian/libndn-cxx-dev.install
@@ -1,2 +1,3 @@
 usr/include/*
 usr/lib*/*/pkgconfig/*
+usr/lib/*/*.so
\ No newline at end of file
diff --git a/ndn-cxx/debian/libndn-cxx.dirs b/ndn-cxx/debian/libndn-cxx.dirs
new file mode 100644
index 0000000..6845771
--- /dev/null
+++ b/ndn-cxx/debian/libndn-cxx.dirs
@@ -0,0 +1 @@
+usr/lib
diff --git a/ndn-cxx/debian/libndn-cxx.install b/ndn-cxx/debian/libndn-cxx.install
new file mode 100644
index 0000000..1b5eb74
--- /dev/null
+++ b/ndn-cxx/debian/libndn-cxx.install
@@ -0,0 +1,2 @@
+usr/lib/*/*.so.*
+
diff --git a/ndn-cxx/debian/ndn-cxx.dirs b/ndn-cxx/debian/ndnsec.dirs
similarity index 100%
rename from ndn-cxx/debian/ndn-cxx.dirs
rename to ndn-cxx/debian/ndnsec.dirs
diff --git a/ndn-cxx/debian/ndn-cxx.install b/ndn-cxx/debian/ndnsec.install
similarity index 69%
rename from ndn-cxx/debian/ndn-cxx.install
rename to ndn-cxx/debian/ndnsec.install
index 10f114a..34c48a0 100644
--- a/ndn-cxx/debian/ndn-cxx.install
+++ b/ndn-cxx/debian/ndnsec.install
@@ -1,4 +1,3 @@
 etc/ndn/*
 usr/bin/*
-usr/lib/*/*.so*
 usr/share/man/*
diff --git a/ndn-cxx/debian/rules b/ndn-cxx/debian/rules
index bdaa08c..19caaeb 100755
--- a/ndn-cxx/debian/rules
+++ b/ndn-cxx/debian/rules
@@ -40,4 +40,4 @@
 
 .PHONY: override_dh_strip
 override_dh_strip:
-	dh_strip --dbg-package=ndn-cxx-dbg
+	dh_strip --dbg-package=libndn-cxx-dbg