diff --git a/bash_completion b/bash_completion
index 5f465e78..1b6bd59e 100644
--- a/bash_completion
+++ b/bash_completion
@@ -4820,6 +4820,8 @@ _muttaddr()
 {
 	_muttaliases
 	_muttquery
+	cur=${COMP_WORDS[COMP_CWORD]}
+	COMPREPLY=( ${COMPREPLY[@]}  $( compgen -u -- "$cur" ) )
 	return 0
 }
 
diff --git a/debian/changelog b/debian/changelog
index fb0274fd..69b88953 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ bash-completion (20080501-1) UNRELEASED; urgency=low
     (Closes: #474517)
   * Allow tsocks completion.
     (Closes: #409423)
+  * Update mutt completion to handle local usernames.
+    (Closes: #416655)
 
  -- David Paleino <d.paleino@gmail.com>  Thu, 01 May 2008 23:11:27 +0200