diff --git a/scripts/create-changelog.sh b/scripts/create-changelog.sh
index 6fa0818..0ae2ecb 100755
--- a/scripts/create-changelog.sh
+++ b/scripts/create-changelog.sh
@@ -14,6 +14,8 @@ require_job_env BUILD_HOME
 require_job_env FORCE_BUILD
 require_job_env BUILD_DOCKER_IMAGES_DEV
 require_job_env BUILD_DOCKER_IMAGES_STABLE
+declare_job_env PRESERVE_BUILD_CONEXT true
+declare_job_env BUILD_CONTEXT_DIR
 
 load_build_env
 
@@ -91,4 +93,10 @@ if [[ -f "$BUILD_HOME/NEED_BUILD" ]] ; then
     ( source $WORKSPACE_ROOT/BUILD ; echo "$BUILD_NUMBER" >"$BUILD_HOME/LAST_BUILD_NUMBER" ; )
     ( source $WORKSPACE_ROOT/BUILD ; echo "$BUILD_ID" >"$BUILD_HOME/LAST_BUILD_TIMESTAMP" ; )
 
+    if $PRESERVE_BUILD_CONTEXT ; then
+        [[ -n "$BUILD_CONTEXT_DIR" ]] || BUILD_CONTEXT_DIR="$BUILD_OUTPUT_ROOT/context"
+        mkdir -p "$BUILD_CONTEXT_DIR"
+        cp -f "$BUILD_OUTPUT_HOME/CONTEXT" "$BUILD_CONTEXT_DIR/$TIMESTAMP.context"
+    fi
+
 fi
diff --git a/scripts/templates/build.conf.example.in b/scripts/templates/build.conf.example.in
index 9321786..f44bdf0 100644
--- a/scripts/templates/build.conf.example.in
+++ b/scripts/templates/build.conf.example.in
@@ -127,6 +127,11 @@ PUBLISH_ROOT_URL="http://$(hostname -f):8088${PUBLISH_ROOT}"
 PUBLISH_SUBDIR="export"            # may be empty
 PUBLISH_LATEST_LINK=false          # create latest symlink?
 
+# Save extra copies of CONTEXT files? true/false
+PRESERVE_BUILD_CONTEXT=true
+# Where to save them (directory path)? If empty default to $BUILD_OUTPUT_ROOT/context
+BUILD_CONTEXT_DIR=
+
 ################################################################################
 # LAT SDK Cache Configuration
 ################################################################################