2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 449aeed31..1b06168ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@
    - dtucker@cvs.openbsd.org 2009/10/24 00:48:34
      [ssh-keygen.1]
      ssh-keygen now uses AES-128 for private keys
+ - (dtucker) [mdoc2man.awk] Teach it to understand the .Ux macro.
 
 20091011
  - (dtucker) [configure.ac sftp-client.c] Remove the gyrations required for
diff --git a/mdoc2man.awk b/mdoc2man.awk
index 9d1126769..80e8d5ffa 100644
--- a/mdoc2man.awk
+++ b/mdoc2man.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk
 #
-# $Id: mdoc2man.awk,v 1.8 2007/06/05 10:01:16 dtucker Exp $
+# $Id: mdoc2man.awk,v 1.9 2009/10/24 00:52:42 dtucker Exp $
 #
 # Version history:
 #  v4+ Adapted for OpenSSH Portable (see cvs Id and history)
@@ -149,6 +149,9 @@ function add(str) {
     } else if(match(words[w],"^Dt$")) {
       id=wtail()
       next
+    } else if(match(words[w],"^Ux$")) {
+      add("UNIX")
+      skip=1
     } else if(match(words[w],"^Ox$")) {
       add("OpenBSD")
       skip=1