diff --git a/ChangeLog b/ChangeLog
index f29ade31c..6bc7f1b9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-24  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/deviceiter.c (grub_util_iterate_devices): Save a bit of
+	effort by skipping "." and ".." entries up-front.
+	Suggested by: Michael Lazarev.
+
 2010-11-24  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/Makefile.core.def (xz_decompress): Move -lgcc from
diff --git a/util/deviceiter.c b/util/deviceiter.c
index 1de8e54df..30c18beea 100644
--- a/util/deviceiter.c
+++ b/util/deviceiter.c
@@ -536,6 +536,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	   necessary.  */
 	for (entry = readdir (dir); entry; entry = readdir (dir))
 	  {
+	    /* Skip current and parent directory entries.  */
+	    if (strcmp (entry->d_name, ".") == 0 ||
+		strcmp (entry->d_name, "..") == 0)
+	      continue;
 	    /* Skip partition entries.  */
 	    if (strstr (entry->d_name, "-part"))
 	      continue;