diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 2aa4bff..89b4166 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -721,6 +721,12 @@
                 self.fp = None
             raise RuntimeError, 'Mode must be "r", "w" or "a"'
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
+
     def _GetContents(self):
         """Read the directory, making sure we close the file if the format
         is bad."""