diff --git a/doc/tools.texi b/doc/tools.texi
index 1632b1212..e22a2285f 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -1451,6 +1451,13 @@ non-control characters.
 Decode data lines.  That is to remove percent escapes but make sure that
 a new line always starts with a D and a space.
 
+@item -u
+@itemx --unbuffered
+@opindex unbuffered
+Set stdin and stdout into unbuffered I/O mode.  This this sometimes
+useful for scripting.
+
+
 @end table
 
 @mansect control commands
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 626c6c61b..6bbdc816b 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -58,6 +58,7 @@ enum cmd_and_opt_values
     oExec       = 'E',
     oRun        = 'r',
     oSubst      = 's',
+    oUnBuffered = 'u',
 
     oNoVerbose	= 500,
     oHomedir,
@@ -73,7 +74,6 @@ enum cmd_and_opt_values
     oNoHistory,
     oNoAutostart,
     oChUid,
-    oUnBuffered = 'u',
 
     oNoop
   };
@@ -111,7 +111,7 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"),
   ARGPARSE_s_s (oKeyboxdProgram, "keyboxd-program", "@"),
   ARGPARSE_s_s (oChUid,          "chuid",           "@"),
-  ARGPARSE_s_n (oUnBuffered,     "unbuffered", N_("Set stdin/out unbuffered")),
+  ARGPARSE_s_n (oUnBuffered,     "unbuffered", N_("set stdin/out unbuffered")),
 
   ARGPARSE_end ()
 };