diff --git a/xbps-src/shutils/pkgtarget_funcs.sh.in b/xbps-src/shutils/pkgtarget_funcs.sh.in
index 5cf0326b7b..edcab1fb12 100644
--- a/xbps-src/shutils/pkgtarget_funcs.sh.in
+++ b/xbps-src/shutils/pkgtarget_funcs.sh.in
@@ -143,6 +143,23 @@ install_pkg()
 		return 1
 	fi
 
+	# Copy generated pkg metadata files into its metadata dir.
+	if [ ! -f ${DESTDIR}/files.plist ]; then
+		msg_error "${pkgname}: missing metadata files.plist!"
+	fi
+	cp -f ${DESTDIR}/files.plist ${XBPS_PKGMETADIR}/${pkgname}
+	if [ ! -f ${DESTDIR}/props.plist ]; then
+		msg_error "${pkgname}: missing metadata props.plist!"
+	fi
+	cp -f ${DESTDIR}/props.plist ${XBPS_PKGMETADIR}/${pkgname}
+	if [ -f ${DESTDIR}/INSTALL ]; then
+		install -m750 ${DESTDIR}/INSTALL \
+			${XBPS_PKGMETADIR}/${pkgname}
+	fi
+	if [ -f ${DESTDIR}/REMOVE ]; then
+		install -m750 ${DESTDIR}/REMOVE \
+			${XBPS_PKGMETADIR}/${pkgname}
+	fi
 	#
 	# Remove $wrksrc if -C not specified.
 	#
@@ -161,7 +178,7 @@ install_pkg_with_binpkg()
 
 	msg_normal "Installing binary pkg: $pkgpattern\n"
 	${fakeroot_cmd} ${fakeroot_cmd_args} ${XBPS_BIN_CMD} \
-		-y install \""$pkgpattern\""
+		-Ay install \""$pkgpattern\""
 	return $?
 }