diff --git a/ChangeLog b/ChangeLog
index 148625018..7211ac92a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-28  Clint Adams  <clint@zsh.org>
 
+	* 22469: R. Ramkumar: Completion/Unix/Command/_mount: use
+	_canonical_paths.
+
 	* 22468: R. Ramkumar: Completion/Unix/Command/_mount: fixes and
 	updates.
 
diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index e3bbb61f3..72bdf0e93 100644
--- a/Completion/Unix/Command/_mount
+++ b/Completion/Unix/Command/_mount
@@ -870,7 +870,8 @@ udevordir)
 
   _alternative \
     'device-labels:device label:compadd -a dev_tmp' \
-    'directories:mount point:compadd -a mp_tmp' && ret=0
+    'device-paths: device path:_canonical_paths -A dpath_tmp -N device-paths device\ path' \
+    'directories:mount point:_canonical_paths -A mp_tmp -N directories mount\ point' && ret=0
   ;;
 esac