diff --git a/tools/tools/nanobsd/_xxx_includes.subr b/tools/tools/nanobsd/_xxx_includes.subr
--- a/tools/tools/nanobsd/_xxx_includes.subr
+++ b/tools/tools/nanobsd/_xxx_includes.subr
@@ -33,3 +33,10 @@
 		tgt_rm usr/share/man/man7/tests.7.gz
 	fi
 }
+
+# Already fixed upstream
+# https://github.com/libarchive/libarchive/pull/3008
+# Account for a bug in libarchive, where the first entry is "/."
+_xxx_libarchive_mtree_bug() {
+	sed -i "" -e 's|^/\. |\. |' "$NANO_METALOG"
+}