diff --git a/nfd/Makefile b/nfd/Makefile
index b5cd931..f88adde 100644
--- a/nfd/Makefile
+++ b/nfd/Makefile
@@ -2,15 +2,15 @@
 GIT_URL=https://github.com/named-data/NFD.git
 
 # Tag name or commit hash for checkout
-GIT_VERSION=NFD-0.6.3
+GIT_VERSION=NFD-0.6.4
 
 # Package name
 NAME=nfd
 
 # Package version
-VERSION=0.6.3
+VERSION=0.6.4
 
 # PPA version
-PPA_VERSION=2
+PPA_VERSION=1
 
 include ../packaging.mk
diff --git a/nfd/debian/changelog b/nfd/debian/changelog
index aca831c..f8332f5 100644
--- a/nfd/debian/changelog
+++ b/nfd/debian/changelog
@@ -1,3 +1,15 @@
+nfd (0.6.4-ppa1~DISTRO) DISTRO; urgency=low
+
+  * Version based on NFD-0.6.4 (https://github.com/named-data/NFD.git)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Fri, 19 Oct 2018 21:54:34 +0000
+
+nfd (0.6.3-2-g3c0c0356-ppa1~DISTRO) DISTRO; urgency=low
+
+  * Hotfix of version 0.6.3
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Wed, 17 Oct 2018 16:39:58 +0000
+
 nfd (0.6.3-ppa2~DISTRO) DISTRO; urgency=low
 
   * Version based on NFD-0.6.3 (https://github.com/named-data/NFD.git)
diff --git a/nlsr/Makefile b/nlsr/Makefile
index af62335..bf3d39a 100644
--- a/nlsr/Makefile
+++ b/nlsr/Makefile
@@ -1,14 +1,14 @@
 # URL for git clone
-GIT_URL=https://github.com/named-data/NLSR
+GIT_URL=https://github.com/agawande/NLSR
 
 # Tag name or commit hash for checkout
-GIT_VERSION=05cb728c6321f07c8d56f6a57daad9c007d59f9a
+GIT_VERSION=d07ad167a384ef3e0da6621809b5e58f4a1ad705
 
 # Package name
 NAME=nlsr
 
 # Package version
-VERSION=0.4.3-5-g05cb728
+VERSION=0.4.3-7-gd07ad16
 
 # PPA version
 PPA_VERSION=1
diff --git a/nlsr/debian/changelog b/nlsr/debian/changelog
index 6d71917..6e03dda 100644
--- a/nlsr/debian/changelog
+++ b/nlsr/debian/changelog
@@ -1,3 +1,17 @@
+nlsr (0.4.3-7-gd07ad16-ppa1~DISTRO) DISTRO; urgency=low
+
+  * Version based on d07ad167a384ef3e0da6621809b5e58f4a1ad705
+    (https://github.com/agawande/NLSR)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Tue, 13 Nov 2018 01:18:56 +0000
+
+nlsr (0.4.3-6-g3494f736-ppa1~DISTRO) DISTRO; urgency=low
+
+  * Version based on 3494f7366a4483036352275a92c57f017dfa06eb
+    (https://github.com/named-data/NLSR)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Fri, 09 Nov 2018 02:54:51 +0000
+
 nlsr (0.4.3-5-g05cb728-ppa1~DISTRO) DISTRO; urgency=low
 
   * Version based on 05cb728c6321f07c8d56f6a57daad9c007d59f9a