diff --git a/Makefile b/Makefile
index 148ca66fa..cfb11ac84 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,9 @@ IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
 ZOPFLIPNG = zopflipng
 OPTIPNG = optipng
 
+DOWNLOAD_DRIVE_PNGS = get_png_files_from_drive.py
+DRIVE_FOLDER_NAME = Emoji_folder
+
 EMOJI_BUILDER = third_party/color_emoji/emoji_builder.py
 # flag for emoji builder.  Default to legacy small metrics for the time being.
 SMALL_METRICS := -S
@@ -38,7 +41,12 @@ ADD_GLYPHS_FLAGS = -a emoji_aliases.txt
 PUA_ADDER = map_pua_emoji.py
 VS_ADDER = add_vs_cmap.py # from nototools
 
-EMOJI_SRC_DIR ?= png/128
+ifeq (True, False)
+	EMOJI_SRC_DIR ?= png/128
+else
+	EMOJI_SRC_DIR ?= build/combined_png
+endif
+
 FLAGS_SRC_DIR := third_party/region-flags/png
 
 BUILD_DIR := build
@@ -215,7 +223,7 @@ endif
 	ttx "$<"
 
 $(EMOJI).ttf: $(EMOJI).tmpl.ttf $(EMOJI_BUILDER) $(PUA_ADDER) \
-	$(ALL_COMPRESSED_FILES) | check_vs_adder
+	$(ALL_COMPRESSED_FILES) | check_vs_adder | download
 	@$(PYTHON) $(EMOJI_BUILDER) $(SMALL_METRICS) -V $< "$@" "$(COMPRESSED_DIR)/emoji_u"
 	@$(PYTHON) $(PUA_ADDER) "$@" "$@-with-pua"
 	@$(VS_ADDER) -vs 2640 2642 2695 --dstdir '.' -o "$@-with-pua-varsel" "$@-with-pua"
@@ -227,8 +235,11 @@ clean:
 	rm -f waveflag
 	rm -rf $(BUILD_DIR)
 
+download:
+	$(PYTHON) $(DOWNLOAD_DRIVE_PNGS) $(DRIVE_FOLDER_NAME) $(EMOJI_SRC_DIR)
+
 .SECONDARY: $(EMOJI_FILES) $(FLAG_FILES) $(RESIZED_FLAG_FILES) $(RENAMED_FLAG_FILES) \
   $(ALL_QUANTIZED_FILES) $(ALL_COMPRESSED_FILES)
 
-.PHONY:	clean flags emoji renamed_flags quantized compressed check_compress_tool
+.PHONY:	clean flags emoji renamed_flags quantized compressed check_compress_tool download
 
diff --git a/get_png_files_from_drive.py b/get_png_files_from_drive.py
index bf588fdd3..e26fdf2ae 100644
--- a/get_png_files_from_drive.py
+++ b/get_png_files_from_drive.py
@@ -198,7 +198,7 @@ def merge_png_dirs(output_dir):
         full_file_name = path.join(output_dir, file_name)
         if path.isfile(full_file_name):
             shutil.copy(full_file_name, "./build/combined_png")
-    shutil.rmtree(output_dir)
+    shutil.rmtree("./downloaded_pngs/")
 
 
 if __name__ == "__main__":