diff --git a/build_nfs.sh b/build_nfs.sh
index a6c8b4c..f2a7b13 100755
--- a/build_nfs.sh
+++ b/build_nfs.sh
@@ -13,6 +13,9 @@ NAME=$1
 NFSDIR="/nfs/$NAME"
 DEST=${DEST:-/opt/stack}
 
+# Option to use the version of devstack on which we are currently working
+USE_CURRENT_DEVSTACK=${USE_CURRENT_DEVSTACK:-1}
+
 # remove old nfs filesystem if one exists
 rm -rf $DEST
 
diff --git a/build_pxe_ramdisk.sh b/build_pxe_ramdisk.sh
index feba18e..63e2ed4 100755
--- a/build_pxe_ramdisk.sh
+++ b/build_pxe_ramdisk.sh
@@ -17,6 +17,9 @@ CWD=`pwd`
 
 DEST=${DEST:-/opt/stack}
 
+# Option to use the version of devstack on which we are currently working
+USE_CURRENT_DEVSTACK=${USE_CURRENT_DEVSTACK:-1}
+
 # clean install of natty
 if [ ! -d $CHROOTCACHE/natty-base ]; then
     $PROGDIR/make_image.sh -C natty $CHROOTCACHE/natty-base