diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c

index de342b4258..e2977e00da 100644

--- a/lib/launch-libvirt.c

+++ b/lib/launch-libvirt.c

@@ -593,7 +593,7 @@ launch_libvirt (guestfs_h *g, void *datav, const char *libvirt_uri)

       goto cleanup;

     }

-    grp = getgrnam ("qemu");

+    grp = getgrnam ("vmusers");

     if (grp != NULL) {

       if (chown (data->guestfsd_path, 0, grp->gr_gid) == -1) {

         perrorf (g, "chown: %s", data->guestfsd_path);

diff --git a/lib/tmpdirs.c b/lib/tmpdirs.c

index b8e19de2bf..233c48dead 100644

--- a/lib/tmpdirs.c

+++ b/lib/tmpdirs.c

@@ -117,8 +117,6 @@ guestfs_impl_get_tmpdir (guestfs_h *g)

   if (g->int_tmpdir)

     str = g->int_tmpdir;

-  else if (g->env_tmpdir)

-    str = g->env_tmpdir;

   else

     str = "/tmp";

@@ -143,8 +141,6 @@ guestfs_impl_get_cachedir (guestfs_h *g)

   if (g->int_cachedir)

     str = g->int_cachedir;

-  else if (g->env_tmpdir)

-    str = g->env_tmpdir;

   else

     str = "/var/tmp";

diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4

index 16ab3212d1..07caf71647 100644

--- a/m4/guestfs-appliance.m4

+++ b/m4/guestfs-appliance.m4

@@ -114,6 +114,7 @@ if test "x$ENABLE_APPLIANCE" = "xyes"; then

                       fi ) | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@'

                 )"

                 AS_CASE([$DISTRO],

+                        [ALTLINUX],[DISTRO=ALT],

                         [FEDORA | RHEL | CENTOS | ALMALINUX | CLOUDLINUX \

 			 | ROCKY],

                             [DISTRO=REDHAT],

@@ -129,7 +130,7 @@ if test "x$ENABLE_APPLIANCE" = "xyes"; then

     AC_SUBST([DISTRO])

 fi

 AM_CONDITIONAL([HAVE_RPM],

-    [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true],

+    [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA | ALT], [true],

                         [*], [false])])

 AM_CONDITIONAL([HAVE_DPKG],

     [AS_CASE([$DISTRO], [DEBIAN | UBUNTU ], [true],

diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4

index 95eddb2319..d6ba924428 100644

--- a/m4/guestfs-c.m4

+++ b/m4/guestfs-c.m4

@@ -19,6 +19,10 @@ dnl The C compiler environment.

 dnl Define the host CPU architecture (defines 'host_cpu')

 AC_CANONICAL_HOST

+AS_CASE([$host_cpu],

+	[powerpc64 | ppc64le | powerpc64le],[host_cpu=ppc64le],

+	[arm*],[host_cpu=armh])

+

 dnl Check for basic C environment.

 AC_PROG_CC_STDC

 AC_PROG_INSTALL