4 files changed, 132 insertions, 2 deletions
diff --git a/Completion/Debian/Command/.distfiles b/Completion/Debian/Command/.distfiles
index 3b65f7db2..d0406bfc7 100644
--- a/Completion/Debian/Command/.distfiles
+++ b/Completion/Debian/Command/.distfiles
@@ -4,5 +4,5 @@ _apt	_apt-show-versions
 _bts	_bug
 _debchange _dpkg       _dpkg_source  _dput  _dupload
 _update-alternatives   _make-kpkg    _debfoster
-_auto-apt
+_auto-apt _debsign
 '
diff --git a/Completion/Debian/Command/_debsign b/Completion/Debian/Command/_debsign
new file mode 100644
index 000000000..6426ad646
--- /dev/null
+++ b/Completion/Debian/Command/_debsign
@@ -0,0 +1,14 @@
+#compdef debsign
+
+_arguments '-r[copy .changes file from remote host]:[username@]remotehost' \
+           '-p[program with which to sign]:program name' \
+           '-m[maintainer]:maintainer name and email address' \
+           '-e[maintainer]:maintainer name and email address' \
+           '-k[key ID to use for signing]:keyid' \
+           '-s[argument style for signing program]:gpg or pgp' \
+           '-S[Look for source-only .changes file]' \
+           '-a[architecture]:Debian architecture' \
+           '-t[GNU system type]:GNU system type' \
+           '--help[help]' \
+           '--version[version]' \
+           '*:changes or dsc file:_files -g "*.(changes|dsc)"'
diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles
index 367ffc5c7..84ba7627e 100644
--- a/Completion/Unix/Command/.distfiles
+++ b/Completion/Unix/Command/.distfiles
@@ -20,5 +20,5 @@ _fsh          _chkconfig    _cdcd         _irssi        _mysqldiff    _sccs
 _netcat       _larch        _texinfo	  _figlet       _elinks       _tidy
 _global       _global_tags  _ant          _lsof         _mt           _xmlsoft
 _perforce     _python       _antiword     _screen       _renice
-_ecasound     _gpg
+_ecasound     _gpg	    _subversion
 '
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
new file mode 100644
index 000000000..e0a473fe4
--- /dev/null
+++ b/Completion/Unix/Command/_subversion
@@ -0,0 +1,116 @@
+#compdef svn svnadmin svnadmin-static=svnadmin
+
+_svn () {
+
+  _arguments -s \
+    '*::svn command:_svn_command'
+}
+
+_svnadmin () {
+
+  _arguments -s \
+    '*::svnadmin command:_svnadmin_command'
+}
+
+(( $+functions[_svn_command] )) ||
+_svn_command () {
+  local cmd
+
+  if (( ! $+_svn_cmds )); then
+    typeset -gA _svn_cmds
+    _svn_cmds=(
+	${=${(f)${${"$(svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
+    )
+  fi
+
+  if (( CURRENT == 1 )); then
+    _tags commands && { compadd "$@" -k _svn_cmds || compadd "$@" ${_svn_cmds} }
+  else
+    local curcontext="$curcontext"
+
+    cmd="${${(k)_svn_cmds[(R)*:$words[1]:*]}:-${(k)_svn_cmds[(i):$words[1]:]}}"
+    if (( $#cmd )); then
+      curcontext="${curcontext%:*:*}:svn-${cmd}:"
+      _svn_subcommand $cmd
+    else
+      _message "unknown svn command: $words[1]"
+    fi
+  fi
+}
+
+(( $+functions[_svn_subcommand] )) ||
+_svn_subcommand () {
+  local subcmd _svn_subcmds _svn_subcmd_usage
+
+  _svn_subcmd_usage=${${(M)${(f)"$(svn help $1)"}:#usage:*}#usage: $1 }
+
+  _svn_subcmds=(
+    ${${=${${${(M)${(f)"$(svn help $1)"##*Valid options:}:#*:*}%% #:*}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}[2,-1]}
+  )
+
+  [[ "$_svn_subcmd_usage" == *URL* ]] && _svn_subcmds=($_svn_subcmds ":url:_urls")
+  [[ "$_svn_subcmd_usage" == *PATH* ]] && _svn_subcmds=($_svn_subcmds "*:path:_files -/")
+
+    _arguments \
+    	"$_svn_subcmds[@]" && ret=0
+
+    return ret
+
+}
+
+
+(( $+functions[_svn_admincommand] )) ||
+_svnadmin_command () {
+  local cmd
+
+  if (( ! $+_svnadmin_cmds )); then
+    typeset -gA _svnadmin_cmds
+    _svnadmin_cmds=(
+	${=${(f)${${"$(svnadmin help)"#l#*Available subcommands:}}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
+    )
+  fi
+
+  if (( CURRENT == 1 )); then
+    _tags commands && { compadd "$@" -k _svnadmin_cmds || compadd "$@" ${(kv)=_svnadmin_cmds} }
+  else
+    local curcontext="$curcontext"
+
+    cmd="${${(k)_svnadmin_cmds[(R)*:$words[1]:*]}:-${(k)_svnadmin_cmds[(i):$words[1]:]}}"
+    if (( $#cmd )); then
+      curcontext="${curcontext%:*:*}:svnadmin-${cmd}:"
+      _svnadmin_subcommand $cmd
+    else
+      _message "unknown svnadmin command: $words[1]"
+    fi
+  fi
+}
+
+(( $+functions[_svnadmin_subcommand] )) ||
+_svnadmin_subcommand () {
+  local subcmd _svnadmin_subcmds _svnadmin_subcmd_usage
+
+  _svnadmin_subcmd_usage=${${(M)${(f)"$(svnadmin help $1)"}:#$1: usage:*}#$1: usage: svnadmin $1 }
+
+  _svnadmin_subcmds=(
+    ${${=${${${(M)${(f)"$(svnadmin help $1)"##*Valid options:}:#*:*}%% #:*}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}[2,-1]}
+  )
+
+  [[ "$_svnadmin_subcmd_usage" == *REPOS_PATH* ]] &&
+  _svnadmin_subcmds=($_svnadmin_subcmds ":path:_files -/")
+
+    _arguments \
+    	"$_svnadmin_subcmds[@]" && ret=0
+
+    return ret
+
+}
+
+
+_subversion () {
+    case $service in
+    	(svn) _svn "$@" ;;
+	(svnadmin) _svnadmin "$@" ;;
+    esac
+}
+
+_subversion "$@"