diff --git a/make/target-tools.mk b/make/target-tools.mk
index 3fd333cb..b24d9892 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -1262,7 +1262,7 @@ autofs: $(AUTOFS_DEPS) $(DL_DIR)/$(AUTOFS_SOURCE) | $(TARGET_DIR)
 		$(CONFIGURE); \
 		$(MAKE) $($(PKG)_MAKE_OPTS) DONTSTRIP=1; \
 		$(MAKE) $($(PKG)_MAKE_OPTS) install DESTDIR=$(TARGET_DIR)
-	$(INSTALL_COPY) $(TARGET_FILES)/autofs/* $(TARGET_DIR)/
+	$(INSTALL_COPY) $(PKG_FILES_DIR)-skel/* $(TARGET_DIR)/
 	$(UPDATE-RC.D) autofs defaults 75 25
 	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)
diff --git a/skel-root/general/autofs/etc/autofs.conf b/package/autofs/files-skel/etc/autofs.conf
similarity index 100%
rename from skel-root/general/autofs/etc/autofs.conf
rename to package/autofs/files-skel/etc/autofs.conf
diff --git a/skel-root/general/autofs/etc/default/autofs b/package/autofs/files-skel/etc/default/autofs
similarity index 100%
rename from skel-root/general/autofs/etc/default/autofs
rename to package/autofs/files-skel/etc/default/autofs
diff --git a/skel-root/general/autofs/etc/init.d/autofs b/package/autofs/files-skel/etc/init.d/autofs
similarity index 100%
rename from skel-root/general/autofs/etc/init.d/autofs
rename to package/autofs/files-skel/etc/init.d/autofs
diff --git a/skel-root/general/autofs/var/etc/auto.master b/package/autofs/files-skel/var/etc/auto.master
similarity index 100%
rename from skel-root/general/autofs/var/etc/auto.master
rename to package/autofs/files-skel/var/etc/auto.master
diff --git a/skel-root/general/autofs/var/etc/auto.net b/package/autofs/files-skel/var/etc/auto.net
similarity index 100%
rename from skel-root/general/autofs/var/etc/auto.net
rename to package/autofs/files-skel/var/etc/auto.net