diff --git a/bin/xbps-repo/index.c b/bin/xbps-repo/index.c
index 8fd0626c7d..152270c61f 100644
--- a/bin/xbps-repo/index.c
+++ b/bin/xbps-repo/index.c
@@ -94,9 +94,9 @@ repoidx_addpkg(const char *file, const char *filename, const char *pkgdir)
 	if (ar == NULL)
 		return errno;
 
-	/* Enable support for all format and compression methods */
+	/* Enable support for tar format and all compression methods */
 	archive_read_support_compression_all(ar);
-	archive_read_support_format_all(ar);
+	archive_read_support_format_tar(ar);
 
 	if ((rv = archive_read_open_filename(ar, file,
 	     ARCHIVE_READ_BLOCKSIZE)) == -1) {
diff --git a/lib/unpack.c b/lib/unpack.c
index 36126468ed..e2896d15c8 100644
--- a/lib/unpack.c
+++ b/lib/unpack.c
@@ -87,9 +87,9 @@ unpack_archive_init(prop_dictionary_t pkg, const char *binfile)
 		return ENOMEM;
 	}
 
-	/* Enable support for all format and compression methods */
+	/* Enable support for tar format and all compression methods */
 	archive_read_support_compression_all(ar);
-	archive_read_support_format_all(ar);
+	archive_read_support_format_tar(ar);
 
 	/* 2048 is arbitrary... dunno what value is better. */
 	if ((rv = archive_read_open_fd(ar, pkg_fd,