diff --git a/bootstrap.conf b/bootstrap.conf
index 8f25554a3a2e962f043812a67e376601a58c9a77..12f64c8659c2093768ef7a88903d0b46e3a97426 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -42,6 +42,7 @@ inet_pton
 ioctl
 maintainer-makefile
 mkstemp
+mkstemps
 mktempd
 netdb
 perror
diff --git a/tools/virsh.c b/tools/virsh.c
index bc746f8cc54da3e4a8b800e11e680c207d15154e..26d7f5ac758c092705695c177bde99a9dfd62fba 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -8964,10 +8964,10 @@ editWriteToTempFile (vshControl *ctl, const char *doc)
 
     tmpdir = getenv ("TMPDIR");
     if (!tmpdir) tmpdir = "/tmp";
-    snprintf (ret, PATH_MAX, "%s/virshXXXXXX", tmpdir);
-    fd = mkstemp (ret);
+    snprintf (ret, PATH_MAX, "%s/virshXXXXXX.xml", tmpdir);
+    fd = mkstemps(ret, 4);
     if (fd == -1) {
-        vshError(ctl, _("mkstemp: failed to create temporary file: %s"),
+        vshError(ctl, _("mkstemps: failed to create temporary file: %s"),
                  strerror(errno));
         VIR_FREE(ret);
         return NULL;