diff --git a/Android.mk b/Android.mk
index f708638..5e50adb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -197,7 +197,7 @@
 
 VIM_SHARED := $(TARGET_OUT)/usr/share/vim
 
-vim_runtime_files := \
+RUNTIME_FILES := \
   $(vim_runtime_files) \
   $(addprefix doc/, $(vim_doc_files)) \
   $(addprefix colors/, $(vim_colors_files)) \
@@ -205,15 +205,14 @@
   $(addprefix plugin/, $(vim_plugin_files)) \
   $(addprefix autoload/, $(vim_autoload_files)) \
 
-$(vim_runtime_files): $(LOCAL_BUILT_MODULE)
-	@echo "Install: $(VIM_SHARED)/$@"
-	@mkdir -p $(dir $(VIM_SHARED)/$@)
-	$(hide) cp $(vim_runtime_path)/$@ $(VIM_SHARED)/$@
+$(VIM_SHARED): $(ACP)
+	@echo "Install vim runtime files" 
+	@mkdir -p $@
+	@$(foreach RUNTIME_FILE,$(RUNTIME_FILES), \
+		mkdir -p $@/$(dir $(RUNTIME_FILE)); \
+		$(ACP) $(vim_runtime_path)/$(RUNTIME_FILE) $@/$(RUNTIME_FILE); \
+	)
 
-ALL_DEFAULT_INSTALLED_MODULES += $(vim_runtime_files)
-
-ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
-  $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) \
-  $(addprefix $(VIM_SHARED)/, $(vim_runtime_files))
+ALL_DEFAULT_INSTALLED_MODULES += $(VIM_SHARED)
 
 endif