diff --git a/ChangeLog b/ChangeLog
index ff982b3c6..9124825f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-05  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/import_gcry.py: Sort cipher_files, to make build system
+	generation more deterministic.
+
 2012-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/ieee1275/ofdisk.c (scan): Check function return value.
diff --git a/util/import_gcry.py b/util/import_gcry.py
index 18966a6d6..64c5870d0 100644
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -40,7 +40,7 @@ try:
 except:
     print ("WARNING: %s already exists" % cipher_dir_out)
 
-cipher_files = os.listdir (cipher_dir_in)
+cipher_files = sorted (os.listdir (cipher_dir_in))
 conf = codecs.open (os.path.join ("grub-core", "Makefile.gcry.def"), "w", "utf-8")
 conf.write ("AutoGen definitions Makefile.tpl;\n\n")
 confutil = codecs.open ("Makefile.utilgcry.def", "w", "utf-8")