diff --git a/scripts/bitmaps/make_bmp_images.sh b/scripts/bitmaps/make_bmp_images.sh
index 84173c1ffe..3a163c1d59 100755
--- a/scripts/bitmaps/make_bmp_images.sh
+++ b/scripts/bitmaps/make_bmp_images.sh
@@ -83,16 +83,16 @@ function process_one_file {
   if [ -r "$txt_file" ]; then
     # Replace all '$URL' in the URL in the text file with the real url
     perl -p \
-      -e 'BEGIN {$/ = ""; $url = shift; }' \
-      -e 'chomp; s/\$URL/$url/gse;' \
-      -e 'END {print "\n";}' "$url" "$txt_file" > "$label_file"
+      -e 'BEGIN {$/ = undef; $url = shift; }' \
+      -e 's/\s+$/\n/gs; s/\$URL/$url/gs;' \
+      "$url" "$txt_file" > "$label_file"
     # Render it
     convert "$img_crop_a" -fill white \
       -font "$font" -pointsize "$pointsize" -interline-spacing 5 \
-      -gravity south -annotate '+0+10' '@'"$label_file" "$img_txt_a"
+      -gravity south -annotate '+0+0' '@'"$label_file" "$img_txt_a"
     convert "$img_crop_b" -fill white \
       -font "$font" -pointsize "$pointsize" -interline-spacing 5 \
-      -gravity south -annotate '+0+10' '@'"$label_file" "$img_txt_b"
+      -gravity south -annotate '+0+0' '@'"$label_file" "$img_txt_b"
   else
     mv "$img_crop_a" "$img_txt_a"
     mv "$img_crop_b" "$img_txt_b"
@@ -110,5 +110,6 @@ for file in originals/*.gif; do
 done
 
 # Zip up the bitmaps
-(cd "$outdir_a" && zip -qr "${thisdir}/out_${geom_crop_a}.zip" *)
-(cd "$outdir_b" && zip -qr "${thisdir}/out_${geom_crop_b}.zip" *)
+nicename=${url// /_}
+(cd "$outdir_a" && zip -qr "${thisdir}/out_${nicename}__${geom_crop_a}.zip" *)
+(cd "$outdir_b" && zip -qr "${thisdir}/out_${nicename}__${geom_crop_b}.zip" *)
diff --git a/scripts/bitmaps/originals/DeveloperBmp.txt b/scripts/bitmaps/originals/DeveloperBmp.txt
index a42ab35f49..ab76f299ca 100644
--- a/scripts/bitmaps/originals/DeveloperBmp.txt
+++ b/scripts/bitmaps/originals/DeveloperBmp.txt
@@ -1,2 +1,21 @@
 This copy of Chrome OS is untrusted. Press SPACE to begin recovery.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://google.com/chromeos/recovery
 $URL
+
diff --git a/scripts/bitmaps/originals/RecoveryBmp.txt b/scripts/bitmaps/originals/RecoveryBmp.txt
index 1fd65f19c9..f20927e3a9 100644
--- a/scripts/bitmaps/originals/RecoveryBmp.txt
+++ b/scripts/bitmaps/originals/RecoveryBmp.txt
@@ -1,2 +1,20 @@
 Please remove all USB and SD devices to begin recovery.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://google.com/chromeos/recovery
 $URL
diff --git a/scripts/bitmaps/originals/RecoveryMissingOSBmp.txt b/scripts/bitmaps/originals/RecoveryMissingOSBmp.txt
index 4ea870296c..860c2e09cf 100644
--- a/scripts/bitmaps/originals/RecoveryMissingOSBmp.txt
+++ b/scripts/bitmaps/originals/RecoveryMissingOSBmp.txt
@@ -1,2 +1,20 @@
 Chrome OS is missing or damaged. Please connect a recovery device.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://google.com/chromeos/recovery
 $URL
diff --git a/scripts/bitmaps/originals/RecoveryNoOSBmp.txt b/scripts/bitmaps/originals/RecoveryNoOSBmp.txt
index 5a982e3265..e6c57f6980 100644
--- a/scripts/bitmaps/originals/RecoveryNoOSBmp.txt
+++ b/scripts/bitmaps/originals/RecoveryNoOSBmp.txt
@@ -1,2 +1,20 @@
 The device you inserted does not contain Chrome OS. Try another?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://google.com/chromeos/recovery
 $URL