2 files changed, 54 insertions, 6 deletions
diff --git a/Completion/Debian/Command/.distfiles b/Completion/Debian/Command/.distfiles
index 5a4a6ce87..7f7ea1363 100644
--- a/Completion/Debian/Command/.distfiles
+++ b/Completion/Debian/Command/.distfiles
@@ -1,9 +1,8 @@
 DISTFILES_SRC='
 .distfiles
-_apt _aptitude _apt-show-versions
-_bts	_bug
-_debchange _dpkg       _dpkg_source  _dput  _dupload
-_update-alternatives   _make-kpkg    _debfoster
-_auto-apt _debsign
-_update-rc.d
+_apt               _bts _dpkg         _update-alternatives
+_aptitude          _bug _dpkg_source  _update-rc.d
+_apt-move          _debchange   _dput
+_apt-show-versions  _debfoster  _dupload
+_auto-apt          _debsign     _make-kpkg
 '
diff --git a/Completion/Debian/Command/_apt-move b/Completion/Debian/Command/_apt-move
new file mode 100644
index 000000000..e011053fd
--- /dev/null
+++ b/Completion/Debian/Command/_apt-move
@@ -0,0 +1,49 @@
+#compdef apt-move
+
+local state line
+
+_arguments \
+  '-c[Specify an alternative configuration file]' \
+  '-d[Override the DIST setting]' \
+  '-f[Override the MAXDELETE setting]' \
+  '-q[Be quiet; suppress normal output]' \
+  '-t[Show what apt-move would do, but do not actually do anything]' \
+  '1: :->cmds' \
+  '*: :->args' && return 0
+
+case $state in
+  cmds)
+    cmds=('get:update your master files from local apt' \
+          'getlocal:alias of get' \
+          'fsck:fix broken repositories' \
+          'move:move cache files into mirror tree' \
+          'movefile:move files into the repository' \
+          'delete:delete obsolete packages' \
+          'packages:create new local Packages files' \
+          'update:alias for: get move delete packages' \
+          'local:alias for: move delete packages' \
+          'localupdate:alias for: getlocal move delete packages' \
+          'mirror:update your local mirror from remote rsync site' \
+          'sync:same as mirror, but only gets packages that you currently have installed on your system' \
+          'exclude:prints a list of all packages EXCLUDED from the mirror by the .exclude file' \
+          'listbin:prints lists of packages which can serve as the input to mirrorbin(mirror,sync,repo)' \
+          'listsrc:same as listbin, but lists source packages' \
+          'mirrorbin:same as mirror, but gets the packages specified on stdin' \
+          'mirrorsrc:same as mirrorbin, but gets source packages')
+      _describe -t commands 'apt-move command' cmds && return 0
+  ;;
+  args)
+    case $line[1] in
+	  get|getlocal)
+	    # A directory or nothing
+		_files -/
+	  ;;
+	  movefile)
+	    # A .dsc or a .deb
+		_files -g "*.d(sc|eb)"
+	  ;;
+	esac
+  ;;
+esac
+
+return 1