diff --git a/bin/disk-image-create b/bin/disk-image-create
index 9e0dd3784..efbcf853a 100755
--- a/bin/disk-image-create
+++ b/bin/disk-image-create
@@ -55,7 +55,7 @@ function show_options () {
 
 INSTALL_PACKAGES=""
 COMPRESS_IMAGE="true"
-TEMP=`getopt -o a:ho:xucnp: -l no-tmpfs -n $SCRIPTNAME -- "$@"`
+TEMP=`getopt -o a:ho:xucnp: -l no-tmpfs,offline -n $SCRIPTNAME -- "$@"`
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
 
 # Note the quotes around `$TEMP': they are essential!
diff --git a/lib/common-defaults b/lib/common-defaults
index 23aa0acc0..ff06fe781 100644
--- a/lib/common-defaults
+++ b/lib/common-defaults
@@ -39,4 +39,4 @@ export DIB_NO_TMPFS=${DIB_NO_TMPFS:-0}
 _BASE_ELEMENT_DIR=$(dirname $0)/../elements
 ELEMENTS_PATH=${ELEMENTS_PATH:+"$ELEMENTS_PATH:$_BASE_ELEMENT_DIR"}
 export ELEMENTS_PATH=${ELEMENTS_PATH:-$_BASE_ELEMENT_DIR}
-export DIB_OFFLINE=''
+export DIB_OFFLINE=${DIB_OFFLINE:-''}