diff --git a/nfd/Makefile b/nfd/Makefile
index 5dc5ab1..22915d1 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=483efd16685a19da9969ccef9e6357af860c7c0c
+GIT_VERSION=f056c11fd4c1d9d6b7dae4de6b5ca304e5651fd8
 
 # Package name
 NAME=nfd
 
 # Package version
-VERSION=0.2.0~rc2.2
+VERSION=0.2.0~rc2.3
 
 # PPA version
 PPA_VERSION=1
diff --git a/nfd/debian/changelog b/nfd/debian/changelog
index 1eac543..c2a0940 100644
--- a/nfd/debian/changelog
+++ b/nfd/debian/changelog
@@ -1,3 +1,10 @@
+nfd (0.2.0~rc2.3-ppa1~DISTRO) DISTRO; urgency=low
+
+  * New version based on f056c11fd4c1d9d6b7dae4de6b5ca304e5651fd8
+    (https://github.com/named-data/NFD.git)
+
+ -- Alexander Afanasyev <alexander.afanasyev@ucla.edu>  Thu, 14 Aug 2014 18:45:31 -0700
+
 nfd (0.2.0~rc2.2-ppa1~DISTRO) DISTRO; urgency=low
 
   * New version based on 483efd16685a19da9969ccef9e6357af860c7c0c
diff --git a/nfd/debian/nfd-autoreg.default b/nfd/debian/nfd-autoreg.default
index b3aa706..218e2d3 100644
--- a/nfd/debian/nfd-autoreg.default
+++ b/nfd/debian/nfd-autoreg.default
@@ -6,8 +6,11 @@
 # Whitelisted networks
 WHITELIST=""
 
-# Prefixes to register
-PREFIXES="/ndn/guest /ndn/broadcast"
+# Prefixes to register on All faces:
+ALL_FACES_PREFIXES="/ndn/broadcast"
+
+# Prefixes to register just on on-demand faces:
+ON_DEMAND_FACES_PREFIXES=""
 
 # Flags
 FLAGS=""
diff --git a/nfd/debian/nfd-autoreg.upstart b/nfd/debian/nfd-autoreg.upstart
index 8c22c43..dc0bd7f 100644
--- a/nfd/debian/nfd-autoreg.upstart
+++ b/nfd/debian/nfd-autoreg.upstart
@@ -13,7 +13,8 @@
 script
   BLACKLIST=""
   WHITELIST=""
-  PREFIXES=""
+  ALL_FACES_PREFIXES=""
+  ON_DEMAND_FACES_PREFIXES=""
   FLAGS=""
   if [ -f /etc/default/nfd-autoreg ]; then
       . /etc/default/nfd-autoreg
@@ -29,11 +30,16 @@
     whitelist=`for i in $WHITELIST; do echo -n "-w $i "; done`
   fi
 
-  prefixes=""
-  if [ "$PREFIXES" != "" ]; then
-    prefixes=`for i in $PREFIXES; do echo -n "--prefix $i "; done`
+  all_prefixes=""
+  if [ "$ALL_FACES_PREFIXES" != "" ]; then
+    all_prefixes=`for i in $ALL_FACES_PREFIXES; do echo -n "--all-faces-prefix $i "; done`
+  fi
+
+  on_demand_prefixes=""
+  if [ "$ON_DEMAND_FACES_PREFIXES" != "" ]; then
+    on_demand_prefixes=`for i in $ON_DEMAND_FACES_PREFIXES; do echo -n "--prefix $i "; done`
   fi
 
   export HOME=/var/lib/ndn/nfd-autoreg
-  exec /usr/bin/nfd-autoreg $blacklist $whitelist $prefixes $FLAGS
+  exec /usr/bin/nfd-autoreg $blacklist $whitelist $on_demand_prefixes $all_prefixes $FLAGS
 end script