diff --git a/ChangeLog b/ChangeLog
index 3a1dfce30..2e567165c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -113,6 +113,9 @@
    - jakob@cvs.openbsd.org 2001/08/02 15:06:52
      [ssh-keygen.c]
      more verbose usage(). ok markus@
+   - jakob@cvs.openbsd.org 2001/08/02 15:07:23
+     [ssh-keygen.1]
+     document smartcard upload/download. ok markus@
 
 20010803
  - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@@ -6223,4 +6226,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1455 2001/08/06 21:49:06 mouring Exp $
+$Id: ChangeLog,v 1.1456 2001/08/06 21:51:34 mouring Exp $
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 290319d44..e2d41141a 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-keygen.1,v 1.47 2001/07/23 14:14:18 aaron Exp $
+.\"	$OpenBSD: ssh-keygen.1,v 1.48 2001/08/02 15:07:23 jakob Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -76,6 +76,11 @@
 .Nm ssh-keygen
 .Fl B
 .Op Fl f Ar input_keyfile
+.Nm ssh-keygen
+.Fl D Ar reader
+.Nm ssh-keygen
+.Fl U Ar reader
+.Op Fl f Ar input_keyfile
 .Sh DESCRIPTION
 .Nm
 generates, manages and converts authentication keys for
@@ -151,7 +156,7 @@ print the key in a
 to stdout.
 This option allows exporting keys for use by several commercial
 SSH implementations.
-.It Fl f
+.It Fl f Ar filename
 Specifies the filename of the key file.
 .It Fl i
 This option will read an unencrypted private (or public) key file
@@ -194,10 +199,16 @@ The default is
 Show the bubblebabble digest of specified private or public key file.
 .It Fl C Ar comment
 Provides the new comment.
+.It Fl D Ar reader
+Download the RSA public key stored in the smartcard in
+.Ar reader .
 .It Fl N Ar new_passphrase
 Provides the new passphrase.
 .It Fl P Ar passphrase
 Provides the (old) passphrase.
+.It Fl U Ar reader
+Upload an existing RSA private key into the smartcard in
+.Ar reader .
 .El
 .Sh FILES
 .Bl -tag -width Ds