diff --git a/nfd/Makefile b/nfd/Makefile
index d7df384..94da250 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=ad3f1cbc875b8e711526d57374dc33c60b0a91dd
+GIT_VERSION=NFD-0.2.0
 
 # Package name
 NAME=nfd
 
 # Package version
-VERSION=0.2.0~rc2.4
+VERSION=0.2.0
 
 # PPA version
-PPA_VERSION=4
+PPA_VERSION=1
 
 include ../packaging.mk
diff --git a/nfd/debian/changelog b/nfd/debian/changelog
index b4b1ec2..d1457d1 100644
--- a/nfd/debian/changelog
+++ b/nfd/debian/changelog
@@ -1,3 +1,10 @@
+nfd (0.2.0-ppa1~DISTRO) DISTRO; urgency=low
+
+  * New version based on NFD-0.2.0 (https://github.com/named-
+    data/NFD.git)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Mon, 25 Aug 2014 12:04:35 -0700
+
 nfd (0.2.0~rc2.4-ppa4~DISTRO) DISTRO; urgency=low
 
   * New version based on ad3f1cbc875b8e711526d57374dc33c60b0a91dd
diff --git a/nfd/debian/control b/nfd/debian/control
index 492a9c6..a35c07e 100644
--- a/nfd/debian/control
+++ b/nfd/debian/control
@@ -4,7 +4,7 @@
 Build-Depends: debhelper (>= 8.0.0),
  python (>= 2.7.0),
  pkg-config (>= 0.26),
- ndn-cxx-dev (>= 0.2.0~rc2.2),
+ ndn-cxx-dev (>= 0.2.0),
  python-sphinx,
  libpcap-dev,
  libboost-all-dev (>= 1.48.0)
diff --git a/nfd/debian/control.precise b/nfd/debian/control.precise
index ca824be..d3b86b8 100644
--- a/nfd/debian/control.precise
+++ b/nfd/debian/control.precise
@@ -4,7 +4,7 @@
 Build-Depends: debhelper (>= 8.0.0),
  python (>= 2.7.0),
  pkg-config (>= 0.26),
- ndn-cxx-dev (>= 0.2.0~rc2.2),
+ ndn-cxx-dev (>= 0.2.0),
  python-sphinx,
  libpcap-dev,
  libboost1.48-all-dev (>= 1.48.0)
diff --git a/nfd/debian/nfd.conf b/nfd/debian/nfd.conf
index 05f0316..f2e09a5 100644
--- a/nfd/debian/nfd.conf
+++ b/nfd/debian/nfd.conf
@@ -1,7 +1,13 @@
 ; The general section contains settings of nfd process.
-; general
-; {
-; }
+general
+{
+  ; Specify a user and/or group for NFD to drop privileges to
+  ; when not performing privileged tasks. NFD does not drop
+  ; privileges by default.
+
+  ; user ndn
+  ; group ndn
+}
 
 log
 {
@@ -36,6 +42,15 @@
   ; Forwarder INFO
 }
 
+; The tables section configures the CS, PIT, FIB, Strategy Choice, and Measurements
+tables
+{
+
+  ; ContentStore size limit in number of packets
+  ; default is 65536, about 500MB with 8KB packet size
+  cs_max_packets 65536
+}
+
 ; The face_system section defines what faces and channels are created.
 face_system
 {
diff --git a/nfd/debian/rules b/nfd/debian/rules
index 2936900..4d3c3c4 100755
--- a/nfd/debian/rules
+++ b/nfd/debian/rules
@@ -29,6 +29,7 @@
 override_dh_clean:
 	dh_clean
 	./waf distclean
+	rm -f VERSION
 	rm -rf .waf-1*
 	rm -f .waf-tools/*.pyc
 	rm -f docs/*.pyc