diff --git a/ChangeLog b/ChangeLog
index 1bafeb6d5..05e5c1248 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-15  Clint Adams  <clint@zsh.org>
+
+	* 21565: Completion/Unix/Command/_man: better handle uncompresed
+	manpages with .[0-9] in their names.
+
 2005-08-15  Wayne Davison  <wayned@users.sourceforge.net>
 
 	* 21609: Src/glob.c: fixed the readlink() call in statfullpath().
diff --git a/Completion/Unix/Command/_man b/Completion/Unix/Command/_man
index a7b014d1b..4b7669010 100644
--- a/Completion/Unix/Command/_man
+++ b/Completion/Unix/Command/_man
@@ -82,7 +82,7 @@ _man_pages() {
 
   pages=( ${(M)dirs:#*$sect/} )
   compfiles -p pages '' '' "$matcher" '' dummy '*'
-  pages=( ${^~pages}(N:t:r) )
+  pages=( ${^~pages}(N:t) )
 
   (($#mrd)) && pages[$#pages+1]=($(awk $awk $mrd))
 
@@ -90,7 +90,7 @@ _man_pages() {
   # beginning with .<->: that handles problem cases like files called
   # `POSIX.1.5'.
 
-  compadd "$@" - ${pages%.(?|<->*)}
+  compadd "$@" - ${pages%.(?|<->*(|.gz|.bz2|.Z))}
 }
 
 _man "$@"