diff --git a/ChangeLog b/ChangeLog
index 904a481da..3aa797a97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@
  * src/build.c, src/tools.c, src/utils.c, src/utils.h:
    Set IO channels for custom commands to blocking mode
    (thanks to Jeff Pohlmeyer).
+ * data/filetypes.python:
+   Added missing keywords: as, with, False, None and True.
    
 
 2007-02-28  Nick Treleaven  <nick.treleaven@btinternet.com>
diff --git a/data/filetypes.python b/data/filetypes.python
index 07376c695..3dd797ff4 100644
--- a/data/filetypes.python
+++ b/data/filetypes.python
@@ -18,7 +18,7 @@ stringeol=0x000000;0xe0c0e0;false;false
 
 [keywords]
 # all items must be in one line
-primary=and assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while yield
+primary=and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True
 
 
 [settings]
diff --git a/src/highlighting.c b/src/highlighting.c
index 2f697b0c0..b5889af0e 100644
--- a/src/highlighting.c
+++ b/src/highlighting.c
@@ -1584,7 +1584,7 @@ static void styleset_python_init(void)
 	get_keyfile_hex(config, config_home, "styling", "stringeol", "0x000000", "0xe0c0e0", "false", &style_sets[GEANY_FILETYPES_PYTHON].styling[13]);
 
 	style_sets[GEANY_FILETYPES_PYTHON].keywords = g_new(gchar*, 2);
-	get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_PYTHON, 0, "and assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while yield");
+	get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_PYTHON, 0, "and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True");
 	style_sets[GEANY_FILETYPES_PYTHON].keywords[1] = NULL;
 
 	get_keyfile_wordchars(config, config_home,