diff --git a/ChangeLog b/ChangeLog
index 959db45df..fec4dc731 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
+
+	* grub-core/osdep/unix/hostdisk.c (grub_util_make_temporary_file):
+	Handle errors from mkstemp.
+	(grub_util_make_temporary_dir): Handle errors from mkdtemp.
+
 2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* tests/util/grub-shell.in: Use -cdrom and don't force cdrom
diff --git a/grub-core/osdep/unix/hostdisk.c b/grub-core/osdep/unix/hostdisk.c
index 1ca1abbfb..78d4adb71 100644
--- a/grub-core/osdep/unix/hostdisk.c
+++ b/grub-core/osdep/unix/hostdisk.c
@@ -281,7 +281,8 @@ grub_util_make_temporary_file (void)
   memcpy (tmp, t, tl);
   memcpy (tmp + tl, "/grub.XXXXXX",
 	  sizeof ("/grub.XXXXXX"));
-  mkstemp (tmp);
+  if (mkstemp (tmp) == -1)
+    grub_util_error (_("cannot make temporary file: %s"), strerror (errno));
   return tmp;
 }
 
@@ -298,7 +299,9 @@ grub_util_make_temporary_dir (void)
   memcpy (tmp, t, tl);
   memcpy (tmp + tl, "/grub.XXXXXX",
 	  sizeof ("/grub.XXXXXX"));
-  mkdtemp (tmp);
+  if (!mkdtemp (tmp))
+    grub_util_error (_("cannot make temporary directory: %s"),
+		     strerror (errno));
   return tmp;
 }