diff --git a/ChangeLog b/ChangeLog
index 827bd6f55095ee041b5005d190300a6642d57d7c..d97a8cd97fa36e2acf6a0907896f2331a4331ef1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-22  A. Walton  <awalton@gnome.org>
+
+	* libnautilus-private/nautilus-file-utilities.c
+	(nautilus_unique_temporary_file_name):
+	* libnautilus-private/nautilus-metafile.c (metafile_write_local):
+	Use g_mkstemp() instead of mkstemp(). Pointed out by Paolo Borelli.
+
 2009-01-22  Paolo Borelli  <pborelli@katamail.com>
 
 	* eel/eel-gtk-extensions.[ch]: add utility function
diff --git a/eel/ChangeLog b/eel/ChangeLog
index b00b2b6f590034290f228cd7bc772c655ade45ef..6423ed1ed9879b35dbff938fe20437ff4cbad120 100644
--- a/eel/ChangeLog
+++ b/eel/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-22  A. Walton  <awalton@gnome.org>
+
+	* eel-debug-drawing.c (eel_debug_show_pixbuf_in_external_viewer):
+	Use g_mkstemp() instead of mkstemp(). Pointed out by Paolo Borelli.
+
 2009-01-21  A. Walton  <awalton@gnome.org>
 
 	* eel-debug-drawing.c (eel_debug_show_pixbuf_in_external_viewer):
diff --git a/eel/eel-debug-drawing.c b/eel/eel-debug-drawing.c
index 7732b9f44f260249e8962e60f42e5b4b597a45a9..26cd41cad76ce678b69d32f6ce254ee7554bfcb3 100644
--- a/eel/eel-debug-drawing.c
+++ b/eel/eel-debug-drawing.c
@@ -292,7 +292,7 @@ eel_debug_show_pixbuf_in_external_viewer (const GdkPixbuf *pixbuf,
 
 	file_name = g_strdup ("/tmp/eel-debug-png-file-XXXXXX");
 
-	fd = mkstemp (file_name); 
+	fd = g_mkstemp (file_name); 
 	if (fd == -1) {
 		g_free (file_name);
 		file_name = g_strdup_printf ("/tmp/isis-debug-png-file-%d", getpid ());
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index b3ccc536b3435848e43d6bbfc0cf87a79e6046d8..9df0ee862ec3803adb0c8fd87a878366c0a4fe5b 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -812,7 +812,7 @@ nautilus_unique_temporary_file_name (void)
 
 	file_name = g_strdup_printf ("%sXXXXXX", prefix);
 
-	fd = mkstemp (file_name); 
+	fd = g_mkstemp (file_name); 
 	if (fd == -1) {
 		g_free (file_name);
 		file_name = NULL;
diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c
index bb89ea76b7caab55b0e28953f7c92ad38523f05c..b35fc9aa1ccb5b1393ef913f5ee5db60cedeae4f 100644
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@@ -1917,7 +1917,7 @@ metafile_write_local (NautilusMetafile *metafile,
 	temp_path = g_strconcat (metafile_path, "XXXXXX", NULL);
 	failed = FALSE;
 
-	fd = mkstemp (temp_path);
+	fd = g_mkstemp (temp_path);
 	if (fd == -1) {
 		failed = TRUE;
 	}