diff --git a/ChangeLog b/ChangeLog
index bbba954f1..dcc44ab9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,8 @@
      committing at his request)
  - (dtucker) [mdoc2man.awk] Teach it to deal with $Mdocdate tags that
    OpenBSD's cvs now adds.
+ - (dtucker) [mdoc2man.awk] Remove trailing "$" from Mdocdate regex so
+   mindrot's cvs doesn't expand it on us.
 
 20070520
  - (dtucker) OpenBSD CVS Sync
@@ -2969,4 +2971,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4677 2007/06/05 09:16:59 dtucker Exp $
+$Id: ChangeLog,v 1.4678 2007/06/05 09:30:47 dtucker Exp $
diff --git a/mdoc2man.awk b/mdoc2man.awk
index 5f46aa140..ff771a9db 100644
--- a/mdoc2man.awk
+++ b/mdoc2man.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk
 #
-# $Id: mdoc2man.awk,v 1.6 2007/06/05 09:16:59 dtucker Exp $
+# $Id: mdoc2man.awk,v 1.7 2007/06/05 09:30:48 dtucker Exp $
 #
 # Version history:
 #  v4+ Adapted for OpenSSH Portable (see cvs Id and history)
@@ -138,7 +138,7 @@ function add(str) {
 	nospace=0
     }
     if(match(words[w],"^Dd$")) {
-      if(match(words[w+1],"^\\$Mdocdate:$")) {
+      if(match(words[w+1],"^\\$Mdocdate:")) {
         w++;
         if(match(words[w+4],"^\\$$")) {
           words[w+4] = ""