diff --git a/lib/psm.c b/lib/psm.c
index a56cd1f..7fd9b9d 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -1873,6 +1873,8 @@ assert(psm->mi == NULL);
 	    t = stpcpy(t, ".bzdio");
 	if (!strcmp(payload_compressor, "lzma"))
 	    t = stpcpy(t, ".lzdio");
+	if (!strcmp(payload_compressor, "xz"))
+	    t = stpcpy(t, ".xzdio");
 	rc = RPMRC_OK;
     }	break;
 
diff --git a/rpm2cpio.c b/rpm2cpio.c
index 15cf79c..3e668a7 100644
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -55,6 +55,8 @@ int main(int argc, char **argv)
 	    t = stpcpy(t, ".bzdio");
 	if (!strcmp(payload_compressor, "lzma"))
 	    t = stpcpy(t, ".lzdio");
+	if (!strcmp(payload_compressor, "xz"))
+	    t = stpcpy(t, ".xzdio");
     }
 
     gzdi = Fdopen(fdi, rpmio_flags);	/* XXX gzdi == fdi */