diff --git a/scripts/bitmaps/make_bmp_images.sh b/scripts/bitmaps/make_bmp_images.sh
index dbc08dac73..c944fa07d5 100755
--- a/scripts/bitmaps/make_bmp_images.sh
+++ b/scripts/bitmaps/make_bmp_images.sh
@@ -15,20 +15,20 @@
 
 
 # Require one arg
-if [ $# -ne "1" ]; then
-  echo "Usage: $(basename $0) MODEL" 1>&2
+if [ $# -ne "2" ]; then
+  echo "Usage: $(basename $0) <MODEL> <screen geometry>" 1>&2
   exit 1
 fi
 MODEL=$1
+geom_crop=$2
+
+nicename=${MODEL// /_}
 
 # Default URL
 URL='http://google.com/chromeos/recovery'
 
-
 # Image parameters
 geom_orig='1366x800'
-geom_crop_a='1366x768'
-geom_crop_b='1280x800'
 geom_final='800x600!'
 bluecolor='#9ccaec'
 bluefont="Helvetica-Narrow"
@@ -38,23 +38,18 @@ whitepointsize=48
 
 
 # Temporary files
-tmpdir=$(mktemp -d /tmp/tmp.XXXXXXXXX)
+tmpdir=$(mktemp -d /tmp/tmp.bmp.XXXXXX)
 trap "rm -rf $tmpdir" EXIT
 img_orig="${tmpdir}/img_orig.bmp"
-img_crop_a="${tmpdir}/img_crop_a.bmp"
-img_crop_b="${tmpdir}/img_crop_b.bmp"
-img_txt_a="${tmpdir}/img_txt_a.bmp"
-img_txt_b="${tmpdir}/img_txt_b.bmp"
+img_crop="${tmpdir}/img_crop.bmp"
+img_txt="${tmpdir}/img_txt.bmp"
 label_file="${tmpdir}/label.txt"
 label_img="${tmpdir}/label.bmp"
 
 # Output directories
 thisdir=$(readlink -e $(dirname $0))
-outdir_a=${thisdir}/out_${geom_crop_a}
-[ -d "$outdir_a" ] || mkdir -p "$outdir_a"
-outdir_b=${thisdir}/out_${geom_crop_b}
-[ -d "$outdir_b" ] || mkdir -p "$outdir_b"
-
+outdir="${thisdir}/out_${nicename}"
+[ -d "$outdir" ] || mkdir -p "$outdir"
 
 function find_background_color {
   src_img=$1
@@ -70,12 +65,9 @@ function process_one_file {
   root=$(basename "$src_img")
   root=${root%*.*}
   # one more layer of heirarchy to match BIOS source tree
-  dst_dir_a="${outdir_a}/${root}"
-  [ -d "$dst_dir_a" ] || mkdir -p "$dst_dir_a"
-  dst_dir_b="${outdir_b}/${root}"
-  [ -d "$dst_dir_b" ] || mkdir -p "$dst_dir_b"
-  dst_img_a="${dst_dir_a}/${root}.bmp"
-  dst_img_b="${dst_dir_b}/${root}.bmp"
+  dst_dir="${outdir}/${root}"
+  [ -d "$dst_dir" ] || mkdir -p "$dst_dir"
+  dst_img="${dst_dir}/${root}.bmp"
   echo "processing $root ..."
 
   # First, make sure we start with the right-size original
@@ -85,9 +77,7 @@ function process_one_file {
 
   # Now crop that to the two target sizes
   convert "$img_orig" -gravity Center \
-    -crop "$geom_crop_a"+0+0 +repage "$img_crop_a"
-  convert "$img_orig" -gravity Center \
-    -crop "$geom_crop_b"+0+0 +repage "$img_crop_b"
+    -crop "$geom_crop"+0+0 +repage "$img_crop"
 
   # Add the labels in
   if [ -r "$txt_file" ]; then
@@ -118,16 +108,13 @@ function process_one_file {
     convert -background "$bg" -gravity center ${tmpdir}/linetxt_*.bmp \
       label:'\n\n\n\n' -append "$label_img"
     # Finally, layer the label image on top of the original.
-    composite "$label_img" -gravity south "$img_crop_a" "$img_txt_a"
-    composite "$label_img" -gravity south "$img_crop_b" "$img_txt_b"
+    composite "$label_img" -gravity south "$img_crop" "$img_txt"
   else
-    mv "$img_crop_a" "$img_txt_a"
-    mv "$img_crop_b" "$img_txt_b"
+    mv "$img_crop" "$img_txt"
   fi
 
   # Now scale the result to the final size
-  convert "$img_txt_a" -scale "$geom_final" -alpha off "$dst_img_a"
-  convert "$img_txt_b" -scale "$geom_final" -alpha off "$dst_img_b"
+  convert "$img_txt" -scale "$geom_final" -alpha off "$dst_img"
 }
 
 
@@ -137,6 +124,4 @@ for file in originals/*.gif; do
 done
 
 # Zip up the bitmaps
-nicename=${MODEL// /_}
-(cd "$outdir_a" && zip -qr "${thisdir}/out_${nicename}__${geom_crop_a}.zip" *)
-(cd "$outdir_b" && zip -qr "${thisdir}/out_${nicename}__${geom_crop_b}.zip" *)
+(cd "$outdir" && zip -qr "${geom_crop}.zip" *)
diff --git a/scripts/bitmaps/process_all_targets.sh b/scripts/bitmaps/process_all_targets.sh
new file mode 100755
index 0000000000..851a524ffc
--- /dev/null
+++ b/scripts/bitmaps/process_all_targets.sh
@@ -0,0 +1,68 @@
+#!/bin/bash -e
+# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# This script searches the directory tree passed in as the parameter for
+# bmp_*.fv files, figures out the FWID strings from files' names, verifies the
+# FWIDs' integrity (by recalculating the CRC included in the FWID string) and
+# then rebuilds the bitmaps with the appropriate text and target specific
+# geometry.
+#
+
+
+# Given a string "<prefix>_<el1>_<el2>_.._<eln>_<suffix>" print string
+# '<el1> <el2> .. <eln>', i.e. <prefix>_ and _<suffix> dropped and underscores
+# replaced with spaces.
+get_elements() {
+  echo $1 | awk 'BEGIN {FS="_"}; {
+    x = 2;
+    do {
+      printf "%s ", $x;
+      x += 1
+    } while (x < (NF - 1))
+    printf "%s", $(NF-1);
+  }'
+}
+
+# Concatenate input parameters into a space separated string, calculate the
+# string's CRC32 and print the last four hex digits of the crc.
+signer() {
+   python -c "import sys,zlib;
+me=' '.join(sys.argv[1:]);
+print ('%04u'%(zlib.crc32(me)&0xffffffffL))[-4:]" $1
+}
+
+
+if [ "$#" != "1" -o ! -d "$1" ]; then
+   echo "One parameter is required, the path to the chromeos release tree" >&2
+   exit 1
+fi
+
+tree=$(readlink -f $1)
+cd $(dirname "$0")
+for f in $(find "${tree}" -type f -name 'bmp_*_[0-9]*.fv'); do
+  filename=$(basename "$f")
+  elements="$(get_elements $filename)"
+  signature=$(signer "${elements}")
+
+  # Rebuild file name to verify CRC.
+  comp_name=bmp_${elements// /_}_${signature}.fv
+  if [ "${filename}" !=  "${comp_name}" ]; then
+    echo "skipping ${filename} (crc mismatch with ${comp_name})"
+    continue
+  fi
+  echo "Processing ${filename}"
+  case "${elements}" in
+    (*ACER*) geometry='1366x768'
+      ;;
+    (*MARIO*) geometry='1280x800'
+      ;;
+    (*) echo "skipping ${filename}, unknown target geometry"
+      echo
+      continue
+    ;;
+  esac
+  ./make_bmp_images.sh "${elements} ${signature}" "${geometry}"
+  echo
+done