diff --git a/Lib/cgi.py b/Lib/cgi.py
index 5f4bad3c8b6..cf0146f4072 100755
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -525,6 +525,9 @@ class FieldStorage:
         return "FieldStorage(%s, %s, %s)" % (
                 `self.name`, `self.filename`, `self.value`)
 
+    def __iter__(self):
+        return iter(self.keys())
+
     def __getattr__(self, name):
         if name != 'value':
             raise AttributeError, name