diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index 16deae0..be39740 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -1,7 +1,7 @@
 " zip.vim: Handles browsing zipfiles
 "            AUTOLOAD PORTION
-" Date:			Nov 28, 2005
-" Version:		5
+" Date:			Dec 21, 2005
+" Version:		6
 " Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
 " License:		Vim License  (see vim's :help license)
 " Copyright:    Copyright (C) 2005 Charles E. Campbell, Jr. {{{1
@@ -22,7 +22,7 @@
  finish
 endif
 
-let g:loaded_zip= "v5"
+let g:loaded_zip= "v6"
 
 " ----------------
 "  Functions: {{{1
@@ -198,16 +198,21 @@
 
   let zipfile = substitute(a:fname,'zipfile:\(.\{-}\):.*$','\1','')
   let fname   = substitute(a:fname,'zipfile:.\{-}:\(.*\)$','\1','')
-  let dirpath = substitute(fname,'/[^/]\+$','','e')
+
+  if fname =~ '/'
+   let dirpath = substitute(fname,'/[^/]\+$','','e')
+   if executable("cygpath")
+    let dirpath = substitute(system("cygpath ".dirpath),'\n','','e')
+   endif
+   call mkdir(dirpath,"p")
+  endif
   if zipfile !~ '/'
    let zipfile= curdir.'/'.zipfile
   endif
 "  call Decho("zipfile<".zipfile."> fname<".fname.">")
 
-  call mkdir(dirpath,"p")
   exe "w! ".fname
   if executable("cygpath")
-   let dirpath = substitute(system("cygpath ".dirpath),'\n','','e')
    let zipfile = substitute(system("cygpath ".zipfile),'\n','','e')
   endif
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index d3db102..e121a77 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Dec 13
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Dec 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1598,8 +1598,8 @@
 			{not in Vi}
 			{not available when compiled without the +eval
 			or +insert_expand feature}
-	This option specifies a function to be used for CTRL-X CTRL-U
-	completion. |i_CTRL-X_CTRL-U|
+	This option specifies a function to be used for Insert mode completion
+	with CTRL-X CTRL-U. |i_CTRL-X_CTRL-U|
 
 	The function will be invoked with two arguments.  First the function
 	is called to find the start of the text to be completed.  Secondly the
@@ -4644,9 +4644,8 @@
 			{not in Vi}
 			{not available when compiled without the +eval
 			or +insert_expand feature}
-	This option specifies a function to be used for CTRL-X CTRL-O
-	completion. |i_CTRL-X_CTRL-O|
-
+	This option specifies a function to be used for Insert mode omni
+	completion with CTRL-X CTRL-O. |i_CTRL-X_CTRL-O|
 	For the use of the function see 'completefunc'.