diff --git a/ChangeLog b/ChangeLog
index 6dd0cf4b4..b5ea02697 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-12  Clint Adams  <clint@zsh.org>
+
+	* 22549: Completion/Unix/Command/_subversion:
+	improve svn propset completion slightly.
+
 2006-07-11  Peter Stephenson  <pws@csr.com>
 
 	* 22546: Src/parse.c, Test/A04redirect.ztst,
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index 83590103b..7e30e6b6a 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -65,6 +65,13 @@ _svn () {
 	      '*:file:_files -g "*(e:_svn_controlled:)"'
             )
           ;;
+	  (propset)
+	    args=(
+	    ':propname:(svn:ignore svn:keywords svn:executable svn:eol-style svn:mime-type svn:externals svn:needs-lock)'
+	    ${args/(#b)(*--file*):arg:/$match[1]:file:_files}
+	    '*:path or url: _alternative "files:file:_files" "urls:URL:_svn_urls"'
+	    )
+	  ;;
           resolved)
             args+=(
               '*:file:_files -g "*(e:_svn_conflicts:)"'