diff --git a/Android.mk b/Android.mk
index 2fdfa06..5639a38 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,6 +18,9 @@
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
+include $(LOCAL_PATH)/fetcher.mk
+
+include $(CLEAR_VARS)
 include $(LOCAL_PATH)/host_package.mk
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/fetcher.mk b/fetcher.mk
new file mode 100644
index 0000000..e00b1df
--- /dev/null
+++ b/fetcher.mk
@@ -0,0 +1,12 @@
+bin_path := $(notdir $(HOST_OUT_EXECUTABLES))
+
+fetcher_bin := $(HOST_OUT)/$(bin_path)/fetch_cvd
+
+.PHONY: host_fetcher
+host_fetcher: $(fetcher_bin)
+
+# Build this by default when a developer types make
+droidcore: $(fetcher_bin)
+
+# Build and store them on the build server.
+$(call dist-for-goals, dist_files, $(fetcher_bin))