diff --git a/ChangeLog b/ChangeLog
index 0522a044a..696bc40d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-15  Doug Kearns  <djkea2@gus.gscit.monash.edu.au>
+
+	* unposted: Completion/Unix/Command/_python: add missing -C option to
+	_arguments; complete script arguments with _normal
+
 2005-07-14  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
 
 	* 21466: Src/Modules/files.c: lstat() should be stat() in mkdir -p
diff --git a/Completion/Unix/Command/_python b/Completion/Unix/Command/_python
index dc399b789..a430bcf4d 100644
--- a/Completion/Unix/Command/_python
+++ b/Completion/Unix/Command/_python
@@ -5,7 +5,7 @@
 local curcontext="$curcontext" state line expl
 typeset -A opt_args
 
-_arguments -s -S \
+_arguments -C -s -S \
   '(1 -)-c+[program passed in as string (terminates option list)]:python command:' \
   '-d[debug output from parser]' \
   '-E[ignore environment variables (such as PYTHONPATH)]' \
@@ -24,7 +24,7 @@ _arguments -s -S \
   '-W+[warning control]:warning filter (action:message:category:module:lineno):(default always ignore module once error)' \
   '-x[skip first line of source, allowing use of non-Unix forms of #!cmd]' \
   '(-)1:script file:_files -g "*.py(|c|o)(-.)"' \
-  '*:script argument:_files' && return
+  '*::script argument: _normal' && return
 
 if [[ "$state" = modules ]]; then
   local -a modules