from __future__ import with_statement addon for 'with', mostly written by
Neal.
diff --git a/Lib/__future__.py b/Lib/__future__.py
index e49c663..e661260 100644
--- a/Lib/__future__.py
+++ b/Lib/__future__.py
@@ -52,6 +52,7 @@
     "generators",
     "division",
     "absolute_import",
+    "with_statement",
 ]
 
 __all__ = ["all_feature_names"] + all_feature_names
@@ -64,6 +65,7 @@
 CO_GENERATOR_ALLOWED = 0        # generators (obsolete, was 0x1000)
 CO_FUTURE_DIVISION   = 0x2000   # division
 CO_FUTURE_ABSIMPORT  = 0x4000   # absolute_import
+CO_FUTURE_WITH_STATEMENT  = 0x8000   # with statement added in 2.5
 
 class _Feature:
     def __init__(self, optionalRelease, mandatoryRelease, compiler_flag):
@@ -108,3 +110,7 @@
 absolute_import = _Feature((2, 5, 0, "alpha", 1),
                            (2, 7, 0, "alpha", 0),
                            CO_FUTURE_ABSIMPORT)
+
+with_statement = _Feature((2, 5, 0, "alpha", 2),
+                          (2, 6, 0, "alpha", 0),
+                          CO_FUTURE_WITH_STATEMENT)
diff --git a/Lib/compiler/future.py b/Lib/compiler/future.py
index 414e64e..39c3bb9 100644
--- a/Lib/compiler/future.py
+++ b/Lib/compiler/future.py
@@ -15,7 +15,8 @@
 
 class FutureParser:
 
-    features = ("nested_scopes", "generators", "division")
+    features = ("nested_scopes", "generators", "division",
+                "absolute_import", "with_statement")
 
     def __init__(self):
         self.found = {} # set
diff --git a/Lib/test/test_with.py b/Lib/test/test_with.py
index 8423ee1..ed072c9 100644
--- a/Lib/test/test_with.py
+++ b/Lib/test/test_with.py
@@ -2,6 +2,8 @@
 
 """Unit tests for the with statement specified in PEP 343."""
 
+from __future__ import with_statement
+
 __author__ = "Mike Bland"
 __email__ = "mbland at acm dot org"