diff --git a/.mailmap b/.mailmap
index d68867f6066c..5868c64bd5ef 100644
--- a/.mailmap
+++ b/.mailmap
@@ -785,7 +785,8 @@ Scott Wiersdorf <scott@perlcode.org> scott@perlcode.org <scott@perlcode.org>
 Sean Davis <dive@endersgame.net> Sean Davis <dive@ender.com>
 Sebastian Schmidt <yath@yath.de> <yath@yath.de>
 Sebastian Schmidt <yath@yath.de> yath-perlbug@yath.de <yath-perlbug@yath.de>
-Sergey Zhmylove <zhmylove@narod.ru> zhmylove <zhmylove@narod.ru>
+Sergei Zhmylev <zhmylove@narod.ru> Sergey Zhmylove <zhmylove@narod.ru>
+Sergei Zhmylev <zhmylove@narod.ru> zhmylove <zhmylove@narod.ru>
 Shawn M Moore <sartak@gmail.com> Shawn M Moore <code@sartak.org>
 Shawn M Moore <sartak@gmail.com> Shawn M Moore <sartak@bestpractical.com>
 Shigeya Suzuki <shigeya@wide.ad.jp> Shigeya Suzuki <shigeya@foretune.co.jp>
diff --git a/AUTHORS b/AUTHORS
index f6195ddae5a7..acfa9c86a5eb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1272,11 +1272,11 @@ Sebastian Schmidt              <yath@yath.de>
 Sebastian Steinlechner         <steinlechner@gmx.net>
 Sebastian Wittmeier            <Sebastian.Wittmeier@ginko.de>
 Sebastien Barre                <Sebastien.Barre@utc.fr>
+Sergei Zhmylev                 <zhmylove@narod.ru>
 Sergey Alekseev                <varnie29a@mail.ru>
 Sergey Aleynikov               <sergey.aleynikov@gmail.com>
 Sergey Poznyakoff              <gray@gnu.org>
 Sergey Skvortsov
-Sergey Zhmylove                <zhmylove@narod.ru>
 Sergiy Borodych                <bor@cpan.org>
 Sevan Janiyan                  <venture37@geeklan.co.uk>
 Shawn                          <svicalifornia@gmail.com>
diff --git a/lib/perl5db.pl b/lib/perl5db.pl
index fbb909449ff7..5a97174feb10 100644
--- a/lib/perl5db.pl
+++ b/lib/perl5db.pl
@@ -532,7 +532,7 @@ BEGIN
 use vars qw($VERSION $header);
 
 # bump to X.XX in blead, only use X.XX_XX in maint
-$VERSION = '1.81';
+$VERSION = '1.82';
 
 $header = "perl5db.pl version $VERSION";
 
@@ -4798,7 +4798,7 @@ sub cmd_a {
     $line =~ s/\A\./$dbline/;
 
     # Should be a line number followed by an expression.
-    if ( my ($lineno, $expr) = $line =~ /^\s*(\d*)\s*(\S.+)/ ) {
+    if ( my ($lineno, $expr) = $line =~ /^\s*(\d*)\s*(\S.*)/ ) {
 
         if (! length($lineno)) {
             $lineno = $dbline;
@@ -4826,7 +4826,7 @@ sub cmd_a {
                 _set_breakpoint_enabled_status($filename, $lineno, 1);
             }
         } ## end if (length $expr)
-    } ## end if ($line =~ /^\s*(\d*)\s*(\S.+)/)
+    } ## end if ($line =~ /^\s*(\d*)\s*(\S.*)/)
     else {
 
         # Syntax wrong.