2 files changed, 9 insertions, 9 deletions

diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index df4b5a2707d0..859cc3ed8f1e 100644
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -57,7 +57,11 @@ pkg_perform(char **pkgs)
     /* chop suffix off if already specified, remembering if we want to compress  */
     len = strlen(pkg);
     if (len > 4) {
-	if (!strcmp(&pkg[len - 4], ".tgz")) {
+	if (!strcmp(&pkg[len - 4], ".tbz")) {
+	    Zipper = BZIP2;
+	    pkg[len - 4] = '\0';
+	}
+	else if (!strcmp(&pkg[len - 4], ".tgz")) {
 	    Zipper = GZIP;
 	    pkg[len - 4] = '\0';
 	}
@@ -65,14 +69,10 @@ pkg_perform(char **pkgs)
 	    Zipper = NONE;
 	    pkg[len - 4] = '\0';
 	}
-	else if (!strcmp(&pkg[len - 4], ".tbz")) {
-	    Zipper = BZIP2;
-	    pkg[len - 4] = '\0';
-	}
     }
     if (Zipper == BZIP2) {
 	suf = "tbz";
-	setenv("BZIP2", "-9", 0);
+	setenv("BZIP2", "--best", 0);
     } else if (Zipper == GZIP) {
 	suf = "tgz";
 	setenv("GZIP", "-9", 0);
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index 605ec64bc63d..3e7a7b181a99 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -279,15 +279,15 @@ Use
 .Xr bzip2 1
 utility to compress package tarball instead of
 .Xr gzip 1 .
-Please note that this option is a NO-OP if format of the resulting
+Please note that this option is a NO-OP if the format of the resulting
 archive is explicitly specified by the recognizeable suffix of
 .Ar pkg-filename .
 Currently
 .Nm
 recognizes the following suffixes:
-.Pa .tgz , .tar , .tbz
+.Pa .tbz , .tgz
 and
-.Pa .tbz2 .
+.Pa .tar .
 .It Fl y
 Compatibility synonym for
 .Fl j .