diff --git a/bin/disk-image-create b/bin/disk-image-create
index ad811a8fd..45d8024bd 100755
--- a/bin/disk-image-create
+++ b/bin/disk-image-create
@@ -109,6 +109,7 @@ function show_options () {
     echo "    -x -- turn on tracing (use -x -x for very detailed tracing)"
     echo "    -u -- uncompressed; do not compress the image - larger but faster"
     echo "    -c -- clear environment before starting work"
+    echo "    --checksum -- generate MD5 and SHA256 checksum files for the created image"
     echo "    --image-size size -- image size in GB for the created image"
     echo "    --image-cache directory -- location for cached images(default ~/.cache/image-create)"
     echo "    --max-online-resize size -- max number of filesystem blocks to support when resizing."
@@ -172,7 +173,7 @@ DIB_DEFAULT_INSTALLTYPE=${DIB_DEFAULT_INSTALLTYPE:-"source"}
 MKFS_OPTS=""
 ACI_MANIFEST=${ACI_MANIFEST:-}
 DOCKER_TARGET=""
-TEMP=`getopt -o a:ho:t:xucnp: -l no-tmpfs,offline,help,version,min-tmpfs:,image-size:,image-cache:,max-online-resize:,mkfs-options:,qemu-img-options:,ramdisk-element:,root-label:,install-type:,docker-target: -n $SCRIPTNAME -- "$@"`
+TEMP=`getopt -o a:ho:t:xucnp: -l checksum,no-tmpfs,offline,help,version,min-tmpfs:,image-size:,image-cache:,max-online-resize:,mkfs-options:,qemu-img-options:,ramdisk-element:,root-label:,install-type:,docker-target: -n $SCRIPTNAME -- "$@"`
 if [ $? -ne 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
 
 # Note the quotes around `$TEMP': they are essential!
@@ -190,6 +191,7 @@ while true ; do
         -c) shift ; export CLEAR_ENV=1;;
         -n) shift; export SKIP_BASE="1";;
         -p) IFS="," read -a INSTALL_PACKAGES <<< "$2"; export INSTALL_PACKAGES ; shift 2 ;;
+        --checksum) shift; export DIB_CHECKSUM=1;;
         --image-size) export DIB_IMAGE_SIZE=$2; shift 2;;
         --image-cache) export DIB_IMAGE_CACHE=$2; shift 2;;
         --max-online-resize) export MAX_ONLINE_RESIZE=$2; shift 2;;
diff --git a/lib/common-defaults b/lib/common-defaults
index ee33eb470..e04718559 100644
--- a/lib/common-defaults
+++ b/lib/common-defaults
@@ -34,6 +34,7 @@ fi
 ARCH=${ARCH:-$_ARCH}
 export ARCH
 
+export DIB_CHECKSUM=${DIB_CHECKSUM:-0}
 export DIB_NO_TMPFS=${DIB_NO_TMPFS:-0}
 export DIB_MIN_TMPFS=${DIB_MIN_TMPFS:-2}
 # Set via the CLI normally.
diff --git a/lib/common-functions b/lib/common-functions
index 152a48718..254525868 100644
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -51,9 +51,19 @@ function finish_image () {
       old_image="${1%.*}"-$(date +%Y.%m.%d-%H.%M.%S).${1##*.}
       echo "Old image found. Renaming it to $old_image"
       mv "$1" "$old_image"
+      if [ -f "$1.md5" ]; then
+        mv "$1.md5" "$old_image.md5"
+      fi
+      if [ -f "$1.sha256" ]; then
+        mv "$1.sha256" "$old_image.sha256"
+      fi
     fi
 
     mv $OUT_IMAGE_PATH $1
+    if [ "$DIB_CHECKSUM" == "1" ]; then
+      md5sum $1 > $1.md5
+      sha256sum $1 > $1.sha256
+    fi
     echo "Image file $1 created..."
 }