diff --git a/ChangeLog b/ChangeLog
index ea6281589..66a2b9a04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 20020417
  - (djm) Tell users to configure /dev/random support into OpenSSL in INSTALL
+ - (djm) Fix .Nm in mdoc2man.pl from pspencer@fields.utoronto.ca
 
 20020415
  - (djm) Unbreak "make install". Fix from Darren Tucker <dtucker@zip.com.au>
@@ -8251,4 +8252,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.2057 2002/04/17 02:22:58 djm Exp $
+$Id: ChangeLog,v 1.2058 2002/04/17 02:30:45 djm Exp $
diff --git a/mdoc2man.pl b/mdoc2man.pl
index fddb2e09d..928fc5d7a 100644
--- a/mdoc2man.pl
+++ b/mdoc2man.pl
@@ -318,11 +318,13 @@ sub ParseMacro # ($line)
 
 		if (/^Nm$/)
 		{
-			$name = shift @words
+			my $n = $name;
+			$n = shift @words
 				if (@words > 0);
+			$name = $n unless $name;
 			$retval .= ".br\n"
 				if ($synopsis);
-			$retval .= "\\fB$name\\fP";
+			$retval .= "\\fB$n\\fP";
 			$nospace = 1
 				if (! $nospace && $words[0] =~ m/^[\.,]/);
 			next;