diff --git a/shutils/metadata.sh b/shutils/metadata.sh
index e0bd8632545..278b54950cf 100644
--- a/shutils/metadata.sh
+++ b/shutils/metadata.sh
@@ -111,8 +111,9 @@ xbps_write_metadata_pkg_real()
         # Find out if this package contains info files and compress
         # all them with gzip.
         #
-	if [ -d "${DESTDIR}/usr/share/info" ]; then
-		if [ -f ${XBPS_MASTERDIR}/usr/share/info/dir ]; then
+	if [ -f ${DESTDIR}/usr/share/info/dir ]; then
+		# Always remove this file if curpkg is not texinfo.
+		if [ "$pkgname" != "texinfo" ]; then
 			rm -f ${DESTDIR}/usr/share/info/dir
 		fi
 		# Add info-files trigger.