diff --git a/CHANGES.current b/CHANGES.current
index 206b6bd68..37d85a816 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.9 (in progress)
 ===========================
 
+2016-02-17: olly
+	    [Python] Add missing keywords 'as' and 'with' to pythonkw.swg.
+
 2016-02-07: kwwette
             [Octave] recognise various unary functions
             * Use __float__() for numeric conversions, e.g. when calling double()
diff --git a/Lib/python/pythonkw.swg b/Lib/python/pythonkw.swg
index b6fc62218..1a4329d20 100644
--- a/Lib/python/pythonkw.swg
+++ b/Lib/python/pythonkw.swg
@@ -12,6 +12,7 @@
 */
 
 PYTHONKW(and);
+PYTHONKW(as);
 PYTHONKW(assert);
 PYTHONKW(break);
 PYTHONKW(class);
@@ -39,6 +40,7 @@ PYTHONKW(raise);
 PYTHONKW(return);
 PYTHONKW(try);
 PYTHONKW(while);
+PYTHONKW(with);
 PYTHONKW(yield);
 
 /*