diff --git a/nfd/Makefile b/nfd/Makefile
index 5941c26..f88adde 100644
--- a/nfd/Makefile
+++ b/nfd/Makefile
@@ -1,14 +1,14 @@
 # URL for git clone
-GIT_URL=https://github.com/cawka/NFD.git
+GIT_URL=https://github.com/named-data/NFD.git
 
 # Tag name or commit hash for checkout
-GIT_VERSION=3c0c03560955122a782d83f552e5f8fd4d2cfff9
+GIT_VERSION=NFD-0.6.4
 
 # Package name
 NAME=nfd
 
 # Package version
-VERSION=0.6.3-2-g3c0c0356
+VERSION=0.6.4
 
 # PPA version
 PPA_VERSION=1
diff --git a/nfd/debian/changelog b/nfd/debian/changelog
index bc5c53e..f8332f5 100644
--- a/nfd/debian/changelog
+++ b/nfd/debian/changelog
@@ -1,3 +1,9 @@
+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