diff --git a/Lib/cgi.py b/Lib/cgi.py
index 7fab38d8753..34a6c6d7026 100755
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -890,6 +890,10 @@ def has_key(self, key):
 	    if item.name == key: return 1
 	return 0
 
+    def __len__(self):
+	"""Dictionary style len(x) support."""
+	return len(self.keys())
+
     def read_urlencoded(self):
 	"""Internal: read data in query string format."""
 	qs = self.fp.read(self.length)