diff --git a/assuan/assuan.h b/assuan/assuan.h
index 3c679725f..a9340019f 100644
--- a/assuan/assuan.h
+++ b/assuan/assuan.h
@@ -74,6 +74,9 @@ typedef enum {
   ASSUAN_Inquire_Error = 121,
   ASSUAN_Invalid_Option = 122,
   ASSUAN_Invalid_Index = 123,
+  ASSUAN_Unexpected_Status = 124,
+  ASSUAN_Unexpected_Data = 125,
+  ASSUAN_Invalid_Status = 126,
 
   ASSUAN_Not_Confirmed = 128,
 
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 7476e6e9a..14c889d66 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -229,7 +229,7 @@ static ARGPARSE_OPTS opts[] = {
     { oAssumeArmor,  "assume-armor", 0, N_("assume input is in PEM format")},
     { oAssumeBase64, "assume-base64", 0,
                                       N_("assume input is in base-64 format")},
-    { oAssumeBase64, "assume-binary", 0,
+    { oAssumeBinary, "assume-binary", 0,
                                       N_("assume input is in binary format")},
 
     { oRecipient, "recipient", 2, N_("|NAME|encrypt for NAME")},