diff --git a/nfd/Makefile b/nfd/Makefile
index 94da250..d9d27b4 100644
--- a/nfd/Makefile
+++ b/nfd/Makefile
@@ -2,13 +2,13 @@
 GIT_URL=https://github.com/named-data/NFD.git
 
 # Tag name or commit hash for checkout
-GIT_VERSION=NFD-0.2.0
+GIT_VERSION=3b21fa3258a276371cbbf9712a55c18de4a22ced
 
 # Package name
 NAME=nfd
 
 # Package version
-VERSION=0.2.0
+VERSION=0.2.0-0
 
 # PPA version
 PPA_VERSION=1
diff --git a/nfd/debian/changelog b/nfd/debian/changelog
index d1457d1..e37c0b1 100644
--- a/nfd/debian/changelog
+++ b/nfd/debian/changelog
@@ -1,3 +1,10 @@
+nfd (0.2.0-0-ppa1~DISTRO) DISTRO; urgency=low
+
+  * New version based on 3b21fa3258a276371cbbf9712a55c18de4a22ced
+    (https://github.com/named-data/NFD.git)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Fri, 05 Sep 2014 09:23:53 -0700
+
 nfd (0.2.0-ppa1~DISTRO) DISTRO; urgency=low
 
   * New version based on NFD-0.2.0 (https://github.com/named-
diff --git a/nfd/debian/ndn-autoconfig-server.default b/nfd/debian/ndn-autoconfig-server.default
index ccad435..202f048 100644
--- a/nfd/debian/ndn-autoconfig-server.default
+++ b/nfd/debian/ndn-autoconfig-server.default
@@ -8,3 +8,9 @@
 # FACE_URI="udp4://spurs.cs.ucla.edu"
 # FACE_URI="udp6://spurs.cs.ucla.edu"
 # FACE_URI="tcp://spurs.cs.ucla.edu"
+
+# Routable prefixes of the router
+ROUTABLE_PREFIXES=""
+
+# Examples:
+# ROUTABLE_PREFIXES="-p /ndn/edu/ucla"
diff --git a/nfd/debian/ndn-autoconfig-server.upstart b/nfd/debian/ndn-autoconfig-server.upstart
index 3cf2059..1dabc6a 100644
--- a/nfd/debian/ndn-autoconfig-server.upstart
+++ b/nfd/debian/ndn-autoconfig-server.upstart
@@ -12,12 +12,13 @@
 
 script
   FACE_URI=""
+  ROUTABLE_PREFIXES=""
   if [ -f /etc/default/ndn-autoconfig-server ]; then
       . /etc/default/ndn-autoconfig-server
   fi
 
   if [ "$FACE_URI" != "" ]; then
     export HOME=/var/lib/ndn/ndn-autoconfig-server
-    exec /usr/bin/ndn-autoconfig-server $FACE_URI
+    exec /usr/bin/ndn-autoconfig-server $ROUTABLE_PREFIXES $FACE_URI
   fi
 end script