diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c
index 03b54e3e8..5cc40954c 100644
--- a/gio/glocalfileoutputstream.c
+++ b/gio/glocalfileoutputstream.c
@@ -303,7 +303,7 @@ _g_local_file_output_stream_really_close (GLocalFileOutputStream *file,
           int errsv = errno;
 
 	  g_set_error (error, G_IO_ERROR,
-		       g_io_error_from_errno (errno),
+		       g_io_error_from_errno (errsv),
 		       _("Error renaming temporary file: %s"),
 		       g_strerror (errsv));
 	  goto err_out;
diff --git a/glib/gspawn.c b/glib/gspawn.c
index b56633143..406ef2b4b 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -1462,11 +1462,12 @@ make_pipe (gint     p[2],
 {
   if (pipe (p) < 0)
     {
+      gint errsv = errno;
       g_set_error (error,
                    G_SPAWN_ERROR,
                    G_SPAWN_ERROR_FAILED,
                    _("Failed to create pipe for communicating with child process (%s)"),
-                   g_strerror (errno));
+                   g_strerror (errsv));
       return FALSE;
     }
   else