diff --git a/common/image.c b/common/image.c
index c33749d51d88a4f27696068a60d197afcb366f3a..e6071099d6365ecc63483c2c1ab4b1df400997ac 100644
--- a/common/image.c
+++ b/common/image.c
@@ -908,6 +908,15 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
 	*rd_start = 0;
 	*rd_end = 0;
 
+#ifdef CONFIG_ANDROID_BOOT_IMAGE
+	/*
+	 * Look for an Android boot image.
+	 */
+	buf = map_sysmem(images->os.start, 0);
+	if (genimg_get_format(buf) == IMAGE_FORMAT_ANDROID)
+		select = argv[0];
+#endif
+
 	if (argc >= 2)
 		select = argv[1];