Add --help; fix standard_prolog in opt_help

48 files changed, 193 insertions, 114 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 8a37695aac..ae3377f5e8 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -182,7 +182,7 @@ app_rand.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 app_rand.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 app_rand.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 app_rand.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h
-app_rand.o: app_rand.c apps.h progs.h
+app_rand.o: app_rand.c apps.h
 apps.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 apps.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 apps.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -200,7 +200,6 @@ apps.o: ../include/openssl/sha.h ../include/openssl/stack.h
 apps.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 apps.o: ../include/openssl/ui.h ../include/openssl/x509.h
 apps.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.c apps.h
-apps.o: progs.h
 asn1pars.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 asn1pars.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 asn1pars.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -216,7 +215,7 @@ asn1pars.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 asn1pars.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 asn1pars.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 asn1pars.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-asn1pars.o: asn1pars.c progs.h
+asn1pars.o: asn1pars.c
 ca.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ca.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 ca.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -232,7 +231,7 @@ ca.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
 ca.o: ../include/openssl/sha.h ../include/openssl/stack.h
 ca.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 ca.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-ca.o: ../include/openssl/x509v3.h apps.h ca.c progs.h
+ca.o: ../include/openssl/x509v3.h apps.h ca.c
 ciphers.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ciphers.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 ciphers.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -253,7 +252,7 @@ ciphers.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 ciphers.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 ciphers.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 ciphers.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-ciphers.o: ../include/openssl/x509v3.h apps.h ciphers.c progs.h
+ciphers.o: ../include/openssl/x509v3.h apps.h ciphers.c
 cms.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 cms.o: ../include/openssl/buffer.h ../include/openssl/cms.h
 cms.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -269,7 +268,7 @@ cms.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
 cms.o: ../include/openssl/sha.h ../include/openssl/stack.h
 cms.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 cms.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-cms.o: ../include/openssl/x509v3.h apps.h cms.c progs.h
+cms.o: ../include/openssl/x509v3.h apps.h cms.c
 crl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 crl.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 crl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -285,7 +284,6 @@ crl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 crl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 crl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 crl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h crl.c
-crl.o: progs.h
 crl2p7.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 crl2p7.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 crl2p7.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -301,7 +299,7 @@ crl2p7.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 crl2p7.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 crl2p7.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 crl2p7.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-crl2p7.o: crl2p7.c progs.h
+crl2p7.o: crl2p7.c
 dgst.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 dgst.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 dgst.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -317,7 +315,7 @@ dgst.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
 dgst.o: ../include/openssl/sha.h ../include/openssl/stack.h
 dgst.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 dgst.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-dgst.o: ../include/openssl/x509v3.h apps.h dgst.c progs.h
+dgst.o: ../include/openssl/x509v3.h apps.h dgst.c
 dh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 dh.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 dh.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -334,7 +332,6 @@ dh.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 dh.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 dh.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 dh.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h dh.c
-dh.o: progs.h
 dsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 dsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 dsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -351,7 +348,6 @@ dsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 dsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 dsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 dsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h dsa.c
-dsa.o: progs.h
 dsaparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 dsaparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 dsaparam.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -370,7 +366,7 @@ dsaparam.o: ../include/openssl/sha.h ../include/openssl/stack.h
 dsaparam.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 dsaparam.o: ../include/openssl/ui.h ../include/openssl/x509.h
 dsaparam.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-dsaparam.o: dsaparam.c progs.h
+dsaparam.o: dsaparam.c
 ec.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ec.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 ec.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -386,7 +382,6 @@ ec.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 ec.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 ec.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 ec.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ec.c
-ec.o: progs.h
 ecparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ecparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 ecparam.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -402,7 +397,7 @@ ecparam.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
 ecparam.o: ../include/openssl/sha.h ../include/openssl/stack.h
 ecparam.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 ecparam.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-ecparam.o: ../include/openssl/x509v3.h apps.h ecparam.c progs.h
+ecparam.o: ../include/openssl/x509v3.h apps.h ecparam.c
 enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 enc.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -419,7 +414,6 @@ enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 enc.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 enc.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h enc.c
-enc.o: progs.h
 engine.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 engine.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 engine.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -440,7 +434,7 @@ engine.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 engine.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 engine.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 engine.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-engine.o: ../include/openssl/x509v3.h apps.h engine.c progs.h
+engine.o: ../include/openssl/x509v3.h apps.h engine.c
 errstr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 errstr.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 errstr.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -461,7 +455,7 @@ errstr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 errstr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 errstr.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 errstr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-errstr.o: ../include/openssl/x509v3.h apps.h errstr.c progs.h
+errstr.o: ../include/openssl/x509v3.h apps.h errstr.c
 gendh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 gendh.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 gendh.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -480,7 +474,7 @@ gendh.o: ../include/openssl/sha.h ../include/openssl/stack.h
 gendh.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 gendh.o: ../include/openssl/ui.h ../include/openssl/x509.h
 gendh.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-gendh.o: gendh.c progs.h
+gendh.o: gendh.c
 gendsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 gendsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 gendsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -497,7 +491,7 @@ gendsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 gendsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 gendsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 gendsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-gendsa.o: gendsa.c progs.h
+gendsa.o: gendsa.c
 genpkey.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 genpkey.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 genpkey.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -513,7 +507,7 @@ genpkey.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 genpkey.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 genpkey.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 genpkey.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-genpkey.o: genpkey.c progs.h
+genpkey.o: genpkey.c
 genrsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 genrsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 genrsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -532,7 +526,7 @@ genrsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
 genrsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 genrsa.o: ../include/openssl/ui.h ../include/openssl/x509.h
 genrsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-genrsa.o: genrsa.c progs.h
+genrsa.o: genrsa.c
 nseq.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 nseq.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 nseq.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -548,7 +542,6 @@ nseq.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 nseq.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 nseq.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 nseq.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h nseq.c
-nseq.o: progs.h
 ocsp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ocsp.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 ocsp.o: ../include/openssl/comp.h ../include/openssl/conf.h
@@ -570,7 +563,6 @@ ocsp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 ocsp.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 ocsp.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 ocsp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ocsp.c
-ocsp.o: progs.h
 openssl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 openssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 openssl.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -606,7 +598,7 @@ opt.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
 opt.o: ../include/openssl/sha.h ../include/openssl/stack.h
 opt.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 opt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-opt.o: ../include/openssl/x509v3.h apps.h opt.c progs.h
+opt.o: ../include/openssl/x509v3.h apps.h opt.c
 passwd.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 passwd.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 passwd.o: ../include/openssl/crypto.h ../include/openssl/des.h
@@ -624,7 +616,7 @@ passwd.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 passwd.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
 passwd.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
 passwd.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-passwd.o: passwd.c progs.h
+passwd.o: passwd.c
 pkcs12.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 pkcs12.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 pkcs12.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -640,7 +632,7 @@ pkcs12.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
 pkcs12.o: ../include/openssl/sha.h ../include/openssl/stack.h
 pkcs12.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 pkcs12.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-pkcs12.o: ../include/openssl/x509v3.h apps.h pkcs12.c progs.h
+pkcs12.o: ../include/openssl/x509v3.h apps.h pkcs12.c
 pkcs7.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 pkcs7.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 pkcs7.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -656,7 +648,7 @@ pkcs7.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 pkcs7.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 pkcs7.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 pkcs7.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-pkcs7.o: pkcs7.c progs.h
+pkcs7.o: pkcs7.c
 pkcs8.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 pkcs8.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 pkcs8.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -672,7 +664,7 @@ pkcs8.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
 pkcs8.o: ../include/openssl/sha.h ../include/openssl/stack.h
 pkcs8.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 pkcs8.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-pkcs8.o: ../include/openssl/x509v3.h apps.h pkcs8.c progs.h
+pkcs8.o: ../include/openssl/x509v3.h apps.h pkcs8.c
 pkey.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 pkey.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 pkey.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -688,7 +680,6 @@ pkey.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 pkey.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 pkey.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 pkey.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h pkey.c
-pkey.o: progs.h
 pkeyparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 pkeyparam.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 pkeyparam.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -704,7 +695,7 @@ pkeyparam.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 pkeyparam.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 pkeyparam.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 pkeyparam.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-pkeyparam.o: pkeyparam.c progs.h
+pkeyparam.o: pkeyparam.c
 pkeyutl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 pkeyutl.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 pkeyutl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -720,7 +711,7 @@ pkeyutl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 pkeyutl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 pkeyutl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 pkeyutl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-pkeyutl.o: pkeyutl.c progs.h
+pkeyutl.o: pkeyutl.c
 prime.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 prime.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 prime.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -735,7 +726,7 @@ prime.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 prime.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 prime.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 prime.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-prime.o: prime.c progs.h
+prime.o: prime.c
 rand.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 rand.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 rand.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -750,7 +741,7 @@ rand.o: ../include/openssl/rand.h ../include/openssl/safestack.h
 rand.o: ../include/openssl/sha.h ../include/openssl/stack.h
 rand.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 rand.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-rand.o: ../include/openssl/x509v3.h apps.h progs.h rand.c
+rand.o: ../include/openssl/x509v3.h apps.h rand.c
 req.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 req.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 req.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -768,8 +759,7 @@ req.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 req.o: ../include/openssl/sha.h ../include/openssl/stack.h
 req.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 req.o: ../include/openssl/ui.h ../include/openssl/x509.h
-req.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h progs.h
-req.o: req.c
+req.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h req.c
 rsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 rsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 rsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -785,8 +775,7 @@ rsa.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h
 rsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 rsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 rsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-rsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h progs.h
-rsa.o: rsa.c
+rsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h rsa.c
 rsautl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 rsautl.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 rsautl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -802,7 +791,7 @@ rsautl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 rsautl.o: ../include/openssl/sha.h ../include/openssl/stack.h
 rsautl.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 rsautl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-rsautl.o: ../include/openssl/x509v3.h apps.h progs.h rsautl.c
+rsautl.o: ../include/openssl/x509v3.h apps.h rsautl.c
 s_cb.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s_cb.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 s_cb.o: ../include/openssl/comp.h ../include/openssl/conf.h
@@ -825,7 +814,7 @@ s_cb.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 s_cb.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 s_cb.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 s_cb.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-s_cb.o: progs.h s_apps.h s_cb.c
+s_cb.o: s_apps.h s_cb.c
 s_client.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s_client.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 s_client.o: ../include/openssl/comp.h ../include/openssl/conf.h
@@ -848,7 +837,7 @@ s_client.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 s_client.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 s_client.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 s_client.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-s_client.o: progs.h s_apps.h s_client.c timeouts.h
+s_client.o: s_apps.h s_client.c timeouts.h
 s_server.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s_server.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 s_server.o: ../include/openssl/comp.h ../include/openssl/conf.h
@@ -873,7 +862,7 @@ s_server.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 s_server.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 s_server.o: ../include/openssl/ui.h ../include/openssl/x509.h
 s_server.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-s_server.o: progs.h s_apps.h s_server.c timeouts.h
+s_server.o: s_apps.h s_server.c timeouts.h
 s_socket.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s_socket.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s_socket.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -894,7 +883,7 @@ s_socket.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 s_socket.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 s_socket.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 s_socket.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-s_socket.o: progs.h s_apps.h s_socket.c
+s_socket.o: s_apps.h s_socket.c
 s_time.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s_time.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s_time.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -915,7 +904,7 @@ s_time.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 s_time.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 s_time.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 s_time.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-s_time.o: ../include/openssl/x509v3.h apps.h progs.h s_apps.h s_time.c
+s_time.o: ../include/openssl/x509v3.h apps.h s_apps.h s_time.c
 sess_id.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 sess_id.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 sess_id.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -936,7 +925,7 @@ sess_id.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 sess_id.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 sess_id.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
 sess_id.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-sess_id.o: ../include/openssl/x509v3.h apps.h progs.h sess_id.c
+sess_id.o: ../include/openssl/x509v3.h apps.h sess_id.c
 smime.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 smime.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 smime.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -952,7 +941,7 @@ smime.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 smime.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 smime.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 smime.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-smime.o: progs.h smime.c
+smime.o: smime.c
 speed.o: ../crypto/bn/bn_lcl.h ../e_os.h ../include/openssl/aes.h
 speed.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 speed.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
@@ -979,7 +968,7 @@ speed.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 speed.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
 speed.o: ../include/openssl/whrlpool.h ../include/openssl/x509.h
 speed.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-speed.o: progs.h speed.c testdsa.h testrsa.h
+speed.o: speed.c testdsa.h testrsa.h
 spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 spkac.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 spkac.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -995,7 +984,7 @@ spkac.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 spkac.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 spkac.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 spkac.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-spkac.o: progs.h spkac.c
+spkac.o: spkac.c
 srp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 srp.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 srp.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -1010,8 +999,7 @@ srp.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
 srp.o: ../include/openssl/sha.h ../include/openssl/srp.h
 srp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 srp.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-srp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h progs.h
-srp.o: srp.c
+srp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h srp.c
 ts.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ts.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 ts.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -1029,8 +1017,7 @@ ts.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 ts.o: ../include/openssl/sha.h ../include/openssl/stack.h
 ts.o: ../include/openssl/symhacks.h ../include/openssl/ts.h
 ts.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-ts.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h progs.h
-ts.o: ts.c
+ts.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ts.c
 verify.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 verify.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 verify.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -1046,7 +1033,7 @@ verify.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 verify.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 verify.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 verify.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-verify.o: progs.h verify.c
+verify.o: verify.c
 version.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 version.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 version.o: ../include/openssl/buffer.h ../include/openssl/conf.h
@@ -1064,7 +1051,7 @@ version.o: ../include/openssl/sha.h ../include/openssl/stack.h
 version.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 version.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
 version.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-version.o: ../include/openssl/x509v3.h apps.h progs.h version.c
+version.o: ../include/openssl/x509v3.h apps.h version.c
 x509.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 x509.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 x509.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -1081,4 +1068,4 @@ x509.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
 x509.o: ../include/openssl/sha.h ../include/openssl/stack.h
 x509.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
 x509.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-x509.o: ../include/openssl/x509v3.h apps.h progs.h x509.c
+x509.o: ../include/openssl/x509v3.h apps.h x509.c
diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 0a5400cdcf..c1f176bf05 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -70,12 +70,13 @@
 #include <openssl/pem.h>
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_IN, OPT_OUT, OPT_INDENT, OPT_NOOUT,
 	OPT_OID, OPT_OFFSET, OPT_LENGTH, OPT_DUMP, OPT_DLIMIT,
 	OPT_STRPARSE, OPT_GENSTR, OPT_GENCONF, OPT_STRICTPEM
 };
 OPTIONS asn1parse_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "input format - one of DER PEM" },
 	{ "in", OPT_IN, '<', "input file" },
 	{ "out", OPT_OUT, '>', "output file (output format is always DER)" },
@@ -129,6 +130,7 @@ int asn1parse_main(int argc, char **argv)
 		switch (i) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(asn1parse_options);
 			goto end;
 		case OPT_INFORM:
diff --git a/apps/ca.c b/apps/ca.c
index 6ed19a13a7..eb0e820b80 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -192,7 +192,7 @@ static int preserve=0;
 static int msie_hack=0;
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_ENGINE, OPT_VERBOSE, OPT_CONFIG, OPT_NAME, OPT_SUBJ, OPT_UTF8,
 	OPT_CREATE_SERIAL, OPT_MULTIVALUE_RDN, OPT_STARTDATE, OPT_ENDDATE,
 	OPT_DAYS, OPT_MD, OPT_POLICY, OPT_KEYFILE, OPT_KEYFORM, OPT_PASSIN,
@@ -205,9 +205,7 @@ enum options {
 };
 
 OPTIONS ca_options[] = {
-#ifndef OPENSSL_NO_ENGINE
-	{ "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
-#endif
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "verbose", OPT_VERBOSE, '-', "Verbose output during processing" },
 	{ "config", OPT_CONFIG, 's', "A config file" },
 	{ "name", OPT_NAME, 's', "The particular CA definition to use" },
@@ -253,6 +251,9 @@ OPTIONS ca_options[] = {
 	{ "crl_hold", OPT_CRL_HOLD, 's' },
 	{ "crl_compromise", OPT_CRL_COMPROMISE, 's' },
 	{ "crl_CA_compromise", OPT_CRL_CA_COMPROMISE, 's' },
+#ifndef OPENSSL_NO_ENGINE
+	{ "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
+#endif
 	{ NULL }
 };
 
@@ -304,6 +305,7 @@ int ca_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(ca_options);
 			goto err;
 		case OPT_IN:
diff --git a/apps/ciphers.c b/apps/ciphers.c
index 7034f6454a..537c5f03f9 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -68,7 +68,7 @@
 
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_V, OPT_UPPER_V, OPT_S,
 #ifndef OPENSSL_NO_SSL_TRACE
 	OPT_STDNAME,
@@ -84,6 +84,7 @@ enum options {
 #endif
 };
 OPTIONS ciphers_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "v", OPT_V, '-', "Verbose listing of the SSL/TLS ciphers" },
 	{ "V", OPT_UPPER_V, '-', "Even more verbose" },
 	{ "s", OPT_S, '-', "Only supported ciphers" },
@@ -126,6 +127,7 @@ int ciphers_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 bad:
 			opt_help(ciphers_options);
 			goto end;
diff --git a/apps/cms.c b/apps/cms.c
index 0510b63d9e..e13a596b5a 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -132,7 +132,7 @@ OPTIONS cms_options[] = {
 	{ OPT_HELP_STR, 1, '-', "Usage: %s [options] cert.pem...\n" },
 	{ "cert.pem", 1, '-', "Recipient certs for encryption" },
 	{ OPT_HELP_STR, 1, '-', "Valid options are:\n" },
-	{ "help", OPT_HELP, '-', "This summary" },
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "Input format SMIME (default), PEM or DER" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format SMIME (default), PEM or DER" },
 	{ "in", OPT_IN, '<', "Input file" },
diff --git a/apps/crl.c b/apps/crl.c
index c585f97aaf..828e6d43ad 100644
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -67,7 +67,7 @@
 #include <openssl/pem.h>
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_IN, OPT_OUTFORM, OPT_OUT, OPT_KEYFORM, OPT_KEY,
 	OPT_ISSUER, OPT_LASTUPDATE, OPT_NEXTUPDATE, OPT_FINGERPRINT,
 	OPT_CRLNUMBER, OPT_BADSIG, OPT_GENDELTA, OPT_CAPATH, OPT_CAFILE,
@@ -77,6 +77,7 @@ enum options {
 };
 
 OPTIONS crl_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "Input format; default PEM" },
 	{ "in", OPT_IN, '<', "Input file - default stdin" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format - default PEM" },
@@ -133,6 +134,7 @@ int crl_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 bad:
 			opt_help(crl_options);
 			goto end;
diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 0272c9e974..b0e58e370d 100644
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -74,11 +74,12 @@
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_NOCRL, OPT_CERTFILE,
 };
 
 OPTIONS crl2pkcs7_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "Input format - DER or PEM" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
 	{ "in", OPT_IN, '<', "Input file" },
@@ -107,6 +108,7 @@ int crl2pkcs7_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(crl2pkcs7_options);
 			goto end;
 		case OPT_INFORM:
diff --git a/apps/dgst.c b/apps/dgst.c
index b011efe4ff..ffdc4b14fb 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -77,7 +77,7 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 	  const char *file,BIO *bmd);
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_C, OPT_R, OPT_RAND, OPT_OUT, OPT_SIGN, OPT_PASSIN, OPT_VERIFY,
 	OPT_PRVERIFY, OPT_SIGNATURE, OPT_KEYFORM, OPT_ENGINE, OPT_ENGINE_IMPL,
 	OPT_HEX, OPT_BINARY, OPT_DEBUG, OPT_FIPS_FINGERPRINT,
@@ -86,6 +86,7 @@ enum options {
 };
 
 static OPTIONS dgst_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "c", OPT_C, '-', "Print the digest with separating colons" },
 	{ "r", OPT_R, '-', "Print the digest in coreutils format" },
 	{ "rand", OPT_RAND, 's' },
@@ -151,6 +152,7 @@ int dgst_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(dgst_options);
 			goto end;
diff --git a/apps/dh.c b/apps/dh.c
index b57b19105d..7a23ca7cd6 100644
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -72,12 +72,13 @@
 #include <openssl/pem.h>
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_ENGINE,
 	OPT_CHECK, OPT_TEXT, OPT_C, OPT_NOOUT
 };
 
 OPTIONS dh_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "Input format - one of DER PEM" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format - one of DER PEM" },
 	{ "in", OPT_IN, '<', "Input file" },
@@ -107,6 +108,7 @@ int dh_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(dh_options);
 			goto end;
 		case OPT_INFORM:
diff --git a/apps/dhparam.c b/apps/dhparam.c
index a584c9c705..7d8fe5886e 100644
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -133,7 +133,7 @@
 static int dh_cb(int p, int n, BN_GENCB *cb);
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
 	OPT_ENGINE, OPT_CHECK, OPT_TEXT, OPT_NOOUT,
 	OPT_RAND, OPT_DSAPARAM, OPT_C, OPT_2, OPT_5,
@@ -142,6 +142,7 @@ enum options {
 OPTIONS dhparam_options[] = {
 	{ OPT_HELP_STR, 1, '-', "Usage: %s [flags] [numbits]\n" },
 	{ OPT_HELP_STR, 1, '-', "Valid options are:\n" },
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "in", OPT_IN, '<', "Input file" },
 	{ "inform", OPT_INFORM, 'F', "Input format, DER or PEM" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format, DER or PEM" },
@@ -179,6 +180,7 @@ int dhparam_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(dhparam_options);
 			goto end;
 		case OPT_INFORM:
diff --git a/apps/dsa.c b/apps/dsa.c
index 61d7b25a8f..dd89b0541f 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -73,15 +73,15 @@
 
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
 	OPT_ENGINE, OPT_PVK_STRONG, OPT_PVK_WEAK,
 	OPT_PVK_NONE, OPT_NOOUT, OPT_TEXT, OPT_MODULUS, OPT_PUBIN,
-	OPT_PUBOUT, OPT_CIPHER, OPT_PASSIN, OPT_PASSOUT, OPT_HELP,
+	OPT_PUBOUT, OPT_CIPHER, OPT_PASSIN, OPT_PASSOUT,
 };
 
 OPTIONS dsa_options[] = {
-	{ "help", OPT_HELP, '-', "This summary" },
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "Input format - DER or PEM" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
 #ifndef OPENSSL_NO_ENGINE
diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index a6648fcd60..e55c8a92c1 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -92,13 +92,14 @@ static void timebomb_sigalarm(int foo)
 static int dsa_cb(int p, int n, BN_GENCB *cb);
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_TEXT, OPT_C,
 	OPT_NOOUT, OPT_GENKEY, OPT_RAND, OPT_NON_FIPS_ALLOW, OPT_ENGINE,
 	OPT_TIMEBOMB,
 };
 
 OPTIONS dsaparam_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "Input format - DER or PEM" },
 	{ "in", OPT_IN, '<', "Input file" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
@@ -135,6 +136,7 @@ int dsaparam_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(dsaparam_options);
 			goto end;
 		case OPT_INFORM:
diff --git a/apps/ec.c b/apps/ec.c
index 13d11eda28..322750b117 100644
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -81,13 +81,14 @@ static OPT_PAIR param_enc[] = {
 };
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_IN, OPT_OUT,
 	OPT_NOOUT, OPT_TEXT, OPT_PARAM_OUT, OPT_PUBIN, OPT_PUBOUT,
 	OPT_PASSIN, OPT_PASSOUT, OPT_PARAM_ENC, OPT_CONV_FORM, OPT_CIPHER,
 };
 
 OPTIONS ec_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "in", OPT_IN, '<', "Input file" },
 	{ "inform", OPT_INFORM, 'F', "Input format - DER or PEM" },
 	{ "out", OPT_OUT, '>', "Output file" },
@@ -132,6 +133,7 @@ int ec_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 bad:
 			opt_help(ec_options);
 			goto end;
diff --git a/apps/ecparam.c b/apps/ecparam.c
index a191b3a17e..8ba143ea70 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -88,13 +88,14 @@
 static int ecparam_print_var(BIO *,BIGNUM *,const char *,int,unsigned char *);
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_TEXT, OPT_C,
 	OPT_CHECK, OPT_LIST_CURVES, OPT_NO_SEED, OPT_NOOUT, OPT_NAME,
 	OPT_CONV_FORM, OPT_PARAM_ENC, OPT_GENKEY, OPT_RAND, OPT_ENGINE,
 };
 
 OPTIONS ecparam_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format - default PEM" },
 	{ "in", OPT_IN, '<', "Input file  - default stdin" },
@@ -152,6 +153,7 @@ int ecparam_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(ecparam_options);
 			goto end;
diff --git a/apps/enc.c b/apps/enc.c
index 9bbca2c5de..db59db1e55 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -81,7 +81,7 @@ static int set_hex(char *in,unsigned char *out,int size);
 static void show_ciphers(const OBJ_NAME *name,void *bio_);
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_E, OPT_IN, OPT_OUT, OPT_PASS, OPT_ENGINE, OPT_D, OPT_P, OPT_V,
 	OPT_NOPAD, OPT_SALT, OPT_NOSALT, OPT_DEBUG, OPT_UPPER_P, OPT_UPPER_A,
 	OPT_A, OPT_Z, OPT_BUFSIZE, OPT_K, OPT_KFILE, OPT_UPPER_K, OPT_NONE,
@@ -89,6 +89,7 @@ enum options {
 };
 
 OPTIONS enc_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "in", OPT_IN, '<', "Input file" },
 	{ "out", OPT_OUT, '>', "Output file" },
 	{ "pass", OPT_PASS, 's', "Passphrase source" },
@@ -171,6 +172,7 @@ int enc_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(enc_options);
 			BIO_printf(bio_err,"Cipher Types\n");
diff --git a/apps/engine.c b/apps/engine.c
index d909ff2c46..ddc04191f4 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -71,11 +71,12 @@
 
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_V, OPT_VV, OPT_VVV, OPT_VVVV, OPT_C,
 	OPT_T, OPT_TT, OPT_PRE, OPT_POST,
 };
 static OPTIONS engine_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "v", OPT_V, '-', "For each engine, list its 'control commands'" },
 	{ "vv", OPT_VV, '-', "Also display each command's description" },
 	{ "vvv", OPT_VVV, '-', "Also add the input flags for each command" },
@@ -353,6 +354,7 @@ int engine_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(engine_options);
 			goto end;
 		case OPT_VVVV:
diff --git a/apps/errstr.c b/apps/errstr.c
index 7dbc866803..8d90714e37 100644
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -67,11 +67,12 @@
 
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_STATS
 };
 
 static OPTIONS errstr_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "stats", OPT_STATS, '-',
 		"Print internal hashtable statistics (long!)" },
 	{ NULL }
@@ -90,6 +91,7 @@ int errstr_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(errstr_options);
 			return 1;
 		case OPT_STATS:
diff --git a/apps/gendh.c b/apps/gendh.c
index dcc86ac2a8..d4edb890a3 100644
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -83,13 +83,14 @@
 static int dh_cb(int p, int n, BN_GENCB *cb);
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_OUT, OPT_2, OPT_5, OPT_ENGINE, OPT_RAND
 };
 
 OPTIONS gendh_options[] = {
 	{ OPT_HELP_STR, 1, '-', "Usage: %s [options] numbits\n" },
 	{ OPT_HELP_STR, 1, '-', "Valid options are:\n" },
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "out", OPT_OUT, '>', "Output the key to specified file" },
 	{ "2", OPT_2, '-', "Use 2 as the generator value" },
 	{ "5", OPT_5, '-', "Use 5 as the generator value" },
@@ -120,6 +121,7 @@ int gendh_main(int argc, char **argv)
 		switch (i) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(gendh_options);
 			goto end;
diff --git a/apps/gendsa.c b/apps/gendsa.c
index a9b776d7d2..b6302a55e4 100644
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -73,7 +73,7 @@
 #define DEFBITS	512
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_OUT, OPT_PASSOUT, OPT_ENGINE, OPT_RAND,
 #ifndef OPENSSL_NO_DES
 	OPT_DES, OPT_DES3,
@@ -95,6 +95,7 @@ enum options {
 OPTIONS gendsa_options[] = {
 	{ OPT_HELP_STR, 1, '-', "Usage: %s [args] dsaparam-file\n" },
 	{ OPT_HELP_STR, 1, '-', "Valid options are:\n" },
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "out", OPT_OUT, '>', "Output the key to the specified file" },
 	{ "passout", OPT_PASSOUT, 's' },
 	{ "rand", OPT_RAND, 's', "Load the file(s) into the random number generator" },
@@ -142,6 +143,7 @@ int gendsa_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 bad:
 			opt_help(gendsa_options);
 			goto end;
diff --git a/apps/genpkey.c b/apps/genpkey.c
index e380164ec3..674741726f 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -71,12 +71,13 @@ static int genpkey_cb(EVP_PKEY_CTX *ctx);
 
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_ENGINE, OPT_OUTFORM, OPT_OUT, OPT_PASS, OPT_PARAMFILE,
 	OPT_ALGORITHM, OPT_PKEYOPT, OPT_GENPARAM, OPT_TEXT, OPT_CIPHER,
 };
 
 OPTIONS genpkey_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "out", OPT_OUT, '>', "Output file" },
 	{ "outform", OPT_OUTFORM, 'F', "output format (DER or PEM)" },
 	{ "pass", OPT_PASS, 's', "Output file pass phrase source" },
@@ -110,6 +111,7 @@ int genpkey_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(genpkey_options);
 			goto end;
diff --git a/apps/genrsa.c b/apps/genrsa.c
index f3043d4138..f81f288af6 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -83,7 +83,7 @@
 static int genrsa_cb(int p, int n, BN_GENCB *cb);
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_3, OPT_F4, OPT_NON_FIPS_ALLOW, OPT_ENGINE,
 	OPT_OUT, OPT_RAND, OPT_PASSOUT,
 #ifndef OPENSSL_NO_DES
@@ -103,7 +103,8 @@ enum options {
 #endif
 };
 
-static OPTIONS genrsa_options[] = {
+OPTIONS genrsa_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "3", OPT_3, '-', "Use 3 for the E value" },
 	{ "F4", OPT_F4, '-', "Use F4 (0x10001) for the E value" },
 	{ "f4", OPT_F4, '-', "Use F4 (0x10001) for the E value" },
@@ -161,6 +162,7 @@ int genrsa_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(genrsa_options);
 			goto err;
 		case OPT_3:
diff --git a/apps/nseq.c b/apps/nseq.c
index 14db4f5802..f15a9beb81 100644
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -64,11 +64,12 @@
 
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_TOSEQ, OPT_IN, OPT_OUT
 };
 
-static OPTIONS nseq_options[] = {
+OPTIONS nseq_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "toseq", OPT_TOSEQ, '-', "Output NS Sequence file" },
 	{ "in", OPT_IN, '<', "Input file" },
 	{ "out", OPT_OUT, '>', "Output file" },
@@ -90,6 +91,7 @@ int nseq_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(nseq_options);
 			goto end;
 		case OPT_TOSEQ:
diff --git a/apps/ocsp.c b/apps/ocsp.c
index ef25787118..cf777db273 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -120,7 +120,7 @@ static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, const char *path,
 				      OCSP_REQUEST *req, int req_timeout);
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_OUTFILE, OPT_TIMEOUT, OPT_URL, OPT_HOST, OPT_PORT,
 	OPT_IGNORE_ERR, OPT_NOVERIFY, OPT_NONCE, OPT_NO_NONCE,
 	OPT_RESP_NO_CERTS, OPT_RESP_KEY_ID, OPT_NO_CERTS,
@@ -137,6 +137,7 @@ enum options {
 };
 
 OPTIONS ocsp_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "out", OPT_OUTFILE, '>', "Output filename" },
 	{ "timeout", OPT_TIMEOUT, 'p' },
 	{ "url", OPT_URL, 's', "Responder URL" },
@@ -234,6 +235,7 @@ int ocsp_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(ocsp_options);
 			goto end;
diff --git a/apps/opt.c b/apps/opt.c
index b1cddb35b1..cb996fbb0d 100644
--- a/apps/opt.c
+++ b/apps/opt.c
@@ -632,7 +632,7 @@ void opt_help(const OPTIONS* list)
 {
 	const OPTIONS* o;
 	int i;
-	int standard_prolog = 1;
+	int standard_prolog;
 	int width = 5;
 	char start[80 + 1];
 	char *p;
@@ -642,7 +642,7 @@ void opt_help(const OPTIONS* list)
 	standard_prolog = list[0].name != OPT_HELP_STR;
 
 	/* Find the widest help. */
-	for (standard_prolog = 1, o = list; o->name; o++) {
+	for (o = list; o->name; o++) {
 		if (o->name == OPT_MORE_STR)
 			continue;
 		i = 2 + (int)strlen(o->name);
@@ -654,7 +654,7 @@ void opt_help(const OPTIONS* list)
 	}
 
 	if (standard_prolog)
-		BIO_printf(bio_err, "Valid options are:\n");
+		BIO_printf(bio_err, "Usage: %s [options]\nValid options are:\n", prog);
 
 	/* Now let's print. */
 	for (o = list; o->name; o++) {
@@ -703,12 +703,14 @@ void opt_help(const OPTIONS* list)
 #include <sys/stat.h>
 
 enum options {
-	OPT_ERR=-1, OPT_EOF=0, OPT_NOTUSED,
+	OPT_ERR=-1, OPT_EOF=0, OPT_NOTUSED, OPT_HELP,
 	OPT_IN, OPT_INFORM, OPT_OUT, OPT_COUNT, OPT_U, OPT_FLAG,
 	OPT_STR, OPT_HELP
 };
 static OPTIONS options[] = {
 	{ OPT_HELP_STR, 1, '-', "Usage: %s flags\n" },
+	{ OPT_HELP_STR, 1, '-', "Valid options are:\n" },
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "in",     OPT_IN,     '<', "input file" },
 	{ OPT_MORE_STR, 1, '-',       "more detail about input" },
 	{ "inform", OPT_INFORM, 'f', "input file format; defaults to pem" },
@@ -744,6 +746,7 @@ int main(int ac, char **av)
 		case OPT_NOTUSED:
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			printf("Usage error; try -help.");
 			return -1;
 		case OPT_HELP:
diff --git a/apps/passwd.c b/apps/passwd.c
index cb51886fd1..c6f786fe07 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -41,13 +41,14 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 	size_t pw_maxlen, int usecrypt, int use1, int useapr1);
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_IN,
 	OPT_NOVERIFY, OPT_QUIET, OPT_TABLE, OPT_REVERSE, OPT_APR1,
 	OPT_1, OPT_CRYPT, OPT_SALT, OPT_STDIN,
 };
 
 OPTIONS passwd_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "in", OPT_IN, '<', "Pead passwords from file" },
 	{ "noverify", OPT_NOVERIFY, '-', "Never verify when reading password from terminal" },
 	{ "quiet", OPT_QUIET, '-', "No warnings" },
@@ -89,6 +90,7 @@ int passwd_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 bad:
 			opt_help(passwd_options);
 			goto err;
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 75044b92da..dee83beb80 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -88,7 +88,7 @@ int cert_load(BIO *in, STACK_OF(X509) *sk);
 static int set_pbe(BIO *err, int *ppbe, const char *str);
 
 enum options {
-    OPT_ERR = -1, OPT_EOF = 0,
+    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
     OPT_CIPHER, OPT_NOKEYS, OPT_KEYEX, OPT_KEYSIG, OPT_NOCERTS, OPT_CLCERTS,
     OPT_CACERTS, OPT_NOOUT, OPT_INFO, OPT_CHAIN, OPT_TWOPASS, OPT_NOMACVER,
     OPT_DESCERT, OPT_EXPORT, OPT_NOITER, OPT_MACITER, OPT_NOMACITER,
@@ -99,6 +99,7 @@ enum options {
 };
 
 OPTIONS pkcs12_options[] = {
+    { "help", OPT_HELP, '-', "Display this summary" },
     { "nokeys", OPT_NOKEYS, '-', "Don't output private keys" },
     { "keyex", OPT_KEYEX, '-', "Set MS key exchange type" },
     { "keysig", OPT_KEYSIG, '-', "Set MS key signature type" },
@@ -167,6 +168,7 @@ int pkcs12_main(int argc, char **argv)
 	    switch (o) {
 	    case OPT_EOF:
 	    case OPT_ERR:
+		case OPT_HELP:
 err:
 		    opt_help(pkcs12_options);
 		    goto end;
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index ac12d7cfd5..b776b027da 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -69,12 +69,13 @@
 #include <openssl/pem.h>
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_NOOUT,
 	OPT_TEXT, OPT_PRINT, OPT_PRINT_CERTS, OPT_ENGINE,
 };
 
 OPTIONS pkcs7_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "Input format - DER or PEM" },
 	{ "in", OPT_IN, '<', "Input file" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
@@ -107,6 +108,7 @@ int pkcs7_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(pkcs7_options);
 			goto end;
 		case OPT_INFORM:
diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 0d371da227..fb6a4ef214 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -66,13 +66,14 @@
 
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_IN, OPT_OUT,
 	OPT_TOPK8, OPT_NOITER, OPT_NOCRYPT, OPT_NOOCT, OPT_NSDB, OPT_EMBED,
 	OPT_V2, OPT_V1, OPT_V2PRF, OPT_ITER, OPT_PASSIN, OPT_PASSOUT,
 };
 
 OPTIONS pkcs8_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "Input format (DER or PEM)" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format (DER or PEM)" },
 	{ "in", OPT_IN, '<', "Input file" },
@@ -121,6 +122,7 @@ int pkcs8_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 bad:
 			opt_help(pkcs8_options);
 			goto end;
diff --git a/apps/pkey.c b/apps/pkey.c
index 7a3d7e64f0..b750fea1ee 100644
--- a/apps/pkey.c
+++ b/apps/pkey.c
@@ -63,13 +63,14 @@
 #include <openssl/evp.h>
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_PASSIN, OPT_PASSOUT, OPT_ENGINE,
 	OPT_IN, OPT_OUT, OPT_PUBIN, OPT_PUBOUT, OPT_TEXT_PUB,
 	OPT_TEXT, OPT_NOOUT, OPT_MD,
 };
 
 OPTIONS pkey_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "Input format (DER or PEM)" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format (DER or PEM)" },
 	{ "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
@@ -109,6 +110,7 @@ int pkey_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 bad:
 			opt_help(pkey_options);
 			goto end;
diff --git a/apps/pkeyparam.c b/apps/pkeyparam.c
index aab40a2f9a..7a991efeef 100644
--- a/apps/pkeyparam.c
+++ b/apps/pkeyparam.c
@@ -63,11 +63,12 @@
 #include <openssl/evp.h>
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_IN, OPT_OUT, OPT_TEXT, OPT_NOOUT, OPT_ENGINE,
 };
 
 OPTIONS pkeyparam_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "in", OPT_IN, '<', "Input file" },
 	{ "out", OPT_OUT, '>', "Output file" },
 	{ "text", OPT_TEXT, '-', "Print parameters as text" },
@@ -94,6 +95,7 @@ int pkeyparam_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(pkeyparam_options);
 			goto end;
 		case OPT_IN:
diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index e2b5b8c03b..b92db4a1db 100644
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -79,7 +79,7 @@ static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
 		unsigned char *in, size_t inlen);
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_ENGINE, OPT_IN, OPT_OUT,
 	OPT_PUBIN, OPT_CERTIN, OPT_ASN1PARSE, OPT_HEXDUMP, OPT_SIGN,
 	OPT_VERIFY, OPT_VERIFYRECOVER, OPT_REV, OPT_ENCRYPT, OPT_DECRYPT,
@@ -88,6 +88,7 @@ enum options {
 };
 
 OPTIONS pkeyutl_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "in", OPT_IN, '<', "Input file" },
 	{ "out", OPT_OUT, '>', "Output file" },
 	{ "pubin", OPT_PUBIN, '-', "Input is a public key" },
@@ -138,6 +139,7 @@ int pkeyutl_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(pkeyutl_options);
 			goto end;
diff --git a/apps/prime.c b/apps/prime.c
index 7e7997419c..297a19ba45 100644
--- a/apps/prime.c
+++ b/apps/prime.c
@@ -53,11 +53,12 @@
 #include <openssl/bn.h>
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_HEX, OPT_GENERATE, OPT_BITS, OPT_SAFE, OPT_CHECKS
 };
 
 OPTIONS prime_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "hex", OPT_HEX, '-', "Hex output" },
 	{ "generate", OPT_GENERATE, '-', "Generate a prime" },
 	{ "bits", OPT_BITS, 'p', "Size of number in bits" },
@@ -83,6 +84,7 @@ int prime_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(prime_options);
 			return 1;
 		case OPT_HEX:
diff --git a/apps/rand.c b/apps/rand.c
index f38b590732..83293bce86 100644
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -65,13 +65,14 @@
 
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_OUT, OPT_ENGINE, OPT_RAND, OPT_BASE64, OPT_HEX
 };
 
 OPTIONS rand_options[] = {
 	{ OPT_HELP_STR, 1, '-', "Usage: %s [flags] num\n" },
 	{ OPT_HELP_STR, 1, '-', "Valid options are:\n" },
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "out", OPT_OUT, '>', "Output file" },
 	{ "rand", OPT_RAND, 's', "Load the file(s) into the random number generator" },
 	{ "base64", OPT_BASE64, '-', "Base64 encode output" },
@@ -101,6 +102,7 @@ int rand_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 bad:
 			opt_help(rand_options);
 			goto end;
diff --git a/apps/req.c b/apps/req.c
index 1dbee359b7..c919e9c0f8 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -128,7 +128,7 @@ static CONF *req_conf=NULL;
 static int batch=0;
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_KEYGEN_ENGINE, OPT_KEY,
 	OPT_PUBKEY, OPT_NEW, OPT_CONFIG, OPT_KEYFORM, OPT_IN, OPT_OUT,
 	OPT_KEYOUT, OPT_PASSIN, OPT_PASSOUT, OPT_RAND, OPT_NEWKEY,
@@ -140,6 +140,7 @@ enum options {
 };
 
 OPTIONS req_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "Input format - DER or PEM" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
 	{ "in", OPT_IN, '<', "Input file" },
@@ -231,6 +232,7 @@ int req_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 bad:
 			opt_help(req_options);
 			goto end;
diff --git a/apps/rsa.c b/apps/rsa.c
index 6f0a48c050..c01016e994 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -72,7 +72,7 @@
 #include <openssl/bn.h>
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_IN, OPT_OUT,
 	OPT_SGCKEY, OPT_PUBIN, OPT_PUBOUT, OPT_PASSOUT, OPT_PASSIN,
 	OPT_RSAPUBKEY_IN, OPT_RSAPUBKEY_OUT, OPT_PVK_STRONG, OPT_PVK_WEAK,
@@ -80,6 +80,7 @@ enum options {
 };
 
 OPTIONS rsa_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'f', "Input format - one of DER NET PEM" },
 	{ "outform", OPT_OUTFORM, 'f', "Output format - one of DER NET PEM" },
 	{ "in", OPT_IN, '<', "Input file" },
@@ -123,6 +124,7 @@ int rsa_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 bad:
 			opt_help(rsa_options);
 			goto end;
diff --git a/apps/rsautl.c b/apps/rsautl.c
index 7060555ade..d9ea570517 100644
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -75,7 +75,7 @@
 #define KEY_CERT	3
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_ENGINE, OPT_IN, OPT_OUT, OPT_ASN1PARSE, OPT_HEXDUMP,
 	OPT_RAW, OPT_OAEP, OPT_SSL, OPT_PKCS, OPT_X931,
 	OPT_SIGN, OPT_VERIFY, OPT_REV, OPT_ENCRYPT, OPT_DECRYPT,
@@ -83,6 +83,7 @@ enum options {
 };
 
 OPTIONS rsautl_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "in", OPT_IN, '<', "Input file" },
 	{ "out", OPT_OUT, '>', "Output file" },
 	{ "inkey", OPT_INKEY, '<', "Input key" },
@@ -135,6 +136,7 @@ int rsautl_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(rsautl_options);
 			goto end;
 		case OPT_KEYFORM:
diff --git a/apps/s_client.c b/apps/s_client.c
index 8ef5c249d3..d90d31216b 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -477,7 +477,7 @@ enum protocols {
 };
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_HOST, OPT_PORT, OPT_CONNECT, OPT_UNIX, OPT_XMPPHOST, OPT_VERIFY,
 	OPT_CERT, OPT_CRL, OPT_CRL_DOWNLOAD, OPT_SESS_OUT, OPT_SESS_IN,
 	OPT_CERTFORM, OPT_CRLFORM, OPT_VERIFY_RET_ERROR, OPT_VERIFY_QUIET,
@@ -501,6 +501,7 @@ enum options {
 };
 
 OPTIONS s_client_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "host", OPT_HOST, 's', "Use -connect instead" },
 	{ "port", OPT_PORT, 'p', "Use -connect instead" },
 	{ "connect", OPT_CONNECT, 's', "TCP/IP where to connect (default is " SSL_HOST_NAME ":" PORT_STR ")" },
@@ -722,6 +723,7 @@ int s_client_main(int argc, char **argv)
 #endif
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(s_client_options);
 			goto end;
 		case OPT_HOST:
diff --git a/apps/s_server.c b/apps/s_server.c
index e8146c5d3c..b14ff52a98 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -834,7 +834,7 @@ static srpsrvparm srp_callback_parm;
 static char *srtp_profiles = NULL;
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_ENGINE, OPT_PORT, OPT_UNIX, OPT_UNLINK, OPT_NACCEPT,
 	OPT_VERIFY, OPT_UPPER_V_VERIFY, OPT_CONTEXT, OPT_CERT, OPT_CRL,
 	OPT_CRL_DOWNLOAD, OPT_SERVERINFO, OPT_CERTFORM, OPT_KEY, OPT_KEYFORM,
@@ -869,6 +869,7 @@ enum options {
 };
 
 OPTIONS s_server_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 
 	{ "port", OPT_PORT, 'p' },
 	{ "accept", OPT_PORT, 'p', "TCP/IP port to accept on (default is " PORT_STR ")" },
@@ -1066,6 +1067,7 @@ int s_server_main(int argc, char *argv[])
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(s_server_options);
 			goto end;
diff --git a/apps/s_time.c b/apps/s_time.c
index 81e433f464..52de5d3a27 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -113,9 +113,10 @@ extern int verify_error;
 static SSL *doConnection(SSL *scon, const char* host, SSL_CTX* ctx);
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0, OPT_CONNECT, OPT_CIPHER, OPT_CERT,
-	OPT_KEY, OPT_CAPATH, OPT_CAFILE, OPT_NEW, OPT_REUSE, OPT_BUGS,
-	OPT_VERIFY, OPT_TIME, OPT_WWW,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+	OPT_CONNECT, OPT_CIPHER, OPT_CERT, OPT_KEY, OPT_CAPATH,
+	OPT_CAFILE, OPT_NEW, OPT_REUSE, OPT_BUGS, OPT_VERIFY, OPT_TIME,
+	OPT_WWW,
 #ifndef OPENSSL_NO_SSL2
 	OPT_SSL2,
 #endif
@@ -128,6 +129,7 @@ enum options {
 };
 
 OPTIONS s_time_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "connect", OPT_CONNECT, 's', "Where to connect as post:port (default is "SSL_CONNECT_NAME ")" },
 	{ "cipher", OPT_CIPHER, 's', "Cipher to use, see 'openssl ciphers'" },
 	{ "cert", OPT_CERT, '<', "Cert file to use, PEM format assumed" },
@@ -197,6 +199,7 @@ int s_time_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(s_time_options);
 			goto end;
diff --git a/apps/sess_id.c b/apps/sess_id.c
index 0a6d26865d..449cbdd59f 100644
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -67,12 +67,13 @@
 #include <openssl/ssl.h>
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
 	OPT_TEXT, OPT_CERT, OPT_NOOUT, OPT_CONTEXT
 };
 
 OPTIONS sess_id_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)" },
 	{ "outform", OPT_OUTFORM, 'F', "Output format - default PEM (PEM, DER or NSS)" },
 	{ "in", OPT_IN, 's', "Input file - default stdin" },
@@ -102,6 +103,7 @@ int sess_id_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(sess_id_options);
 			goto end;
 		case OPT_INFORM:
diff --git a/apps/smime.c b/apps/smime.c
index 225a136b4b..256a86f1d4 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -81,7 +81,7 @@ static int smime_cb(int ok, X509_STORE_CTX *ctx);
 #define SMIME_RESIGN	(6 | SMIME_IP | SMIME_OP | SMIME_SIGNERS)
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_ENCRYPT, OPT_DECRYPT, OPT_SIGN, OPT_RESIGN, OPT_VERIFY,
 	OPT_PK7OUT, OPT_TEXT, OPT_NOINTERN, OPT_NOVERIFY, OPT_NOCHAIN,
 	OPT_NOCERTS, OPT_NOATTR, OPT_NODETACH, OPT_NOSMIMECAP,
@@ -97,6 +97,7 @@ OPTIONS smime_options[] = {
 	{ OPT_HELP_STR, 1, '-', "Usage: %s [options] cert.pem...\n" },
 	{ "cert.pem", 1, '-', "Recipient certs for encryption" },
 	{ OPT_HELP_STR, 1, '-', "Valid options are:\n" },
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "encrypt", OPT_ENCRYPT, '-', "Encrypt message" },
 	{ "decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message" },
 	{ "sign", OPT_SIGN, '-', "Sign message" },
@@ -179,6 +180,7 @@ int smime_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(smime_options);
 			goto end;
diff --git a/apps/speed.c b/apps/speed.c
index cecbf60dc0..68032aa574 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -372,13 +372,15 @@ static int found(const char* name, const OPT_PAIR* pairs, int *result)
 }
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_ELAPSED, OPT_EVP, OPT_DECRYPT, OPT_ENGINE, OPT_MULTI,
 	OPT_MR, OPT_MB,
 };
 
 OPTIONS speed_options[] = {
 	{ OPT_HELP_STR, 1, '-', "Usage: %s [options] ciphers...\n" },
+	{ OPT_HELP_STR, 1, '-', "Valid options are:\n" },
+	{ "help", OPT_HELP, '-', "Display this summary" },
 #if defined(TIMES) || defined(USE_TOD)
 	{ "elapsed", OPT_ELAPSED, '-', "Measure time in real time instead of CPU user time" },
 #endif
@@ -856,6 +858,7 @@ int speed_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(speed_options);
 			goto end;
 		case OPT_ELAPSED:
diff --git a/apps/spkac.c b/apps/spkac.c
index 8f5e5b0959..8e5272ef70 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -72,13 +72,14 @@
 
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_NOOUT, OPT_PUBKEY, OPT_VERIFY, OPT_IN, OPT_OUT,
 	OPT_ENGINE, OPT_KEY, OPT_CHALLENGE, OPT_PASSIN, OPT_SPKAC,
 	OPT_SPKSECT,
 };
 
 OPTIONS spkac_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "in", OPT_IN, '<', "Input file" },
 	{ "out", OPT_OUT, '>', "Output file" },
 	{ "key", OPT_KEY, '<', "Create SPKAC using private key" },
@@ -117,6 +118,7 @@ int spkac_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(spkac_options);
 			goto end;
 		case OPT_IN:
diff --git a/apps/srp.c b/apps/srp.c
index fd472b25a0..fbffd60f13 100644
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -231,13 +231,14 @@ static char *srp_create_user(char *user, char **srp_verifier,
 	}
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_VERBOSE, OPT_CONFIG, OPT_NAME, OPT_SRPVFILE, OPT_ADD,
 	OPT_DELETE, OPT_MODIFY, OPT_LIST, OPT_GN, OPT_USERINFO,
 	OPT_PASSIN, OPT_PASSOUT, OPT_ENGINE,
 };
 
 static OPTIONS srp_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "verbose", OPT_VERBOSE, '-', "Talk a lot while doing things" },
 	{ "config", OPT_CONFIG, '<', "A config file" },
 	{ "name", OPT_NAME, 's', "The particular srp definition to use" },
@@ -275,6 +276,7 @@ int srp_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(srp_options);
 			goto end;
diff --git a/apps/ts.c b/apps/ts.c
index 47ddf86382..b622708132 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -115,7 +115,7 @@ static int verify_cb(int ok, X509_STORE_CTX *ctx);
 
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_ENGINE, OPT_CONFIG, OPT_SECTION, OPT_QUERY, OPT_DATA,
 	OPT_DIGEST, OPT_RAND, OPT_POLICY, OPT_NO_NONCE, OPT_CERT,
 	OPT_IN, OPT_TOKEN_IN, OPT_OUT, OPT_TOKEN_OUT, OPT_TEXT,
@@ -125,6 +125,7 @@ enum options {
 };
 
 OPTIONS ts_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "config", OPT_CONFIG, '<' },
 	{ "section", OPT_SECTION, 's' },
 	{ "query", OPT_QUERY, '-' },
@@ -176,6 +177,7 @@ int ts_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(ts_options);
 			goto end;
diff --git a/apps/verify.c b/apps/verify.c
index b7ce1e9dd7..99d81dfeee 100644
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -73,7 +73,7 @@ static int check(X509_STORE *ctx, char *file,
 static int v_verbose=0, vflags = 0;
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_ENGINE, OPT_CAPATH, OPT_CAFILE, OPT_UNTRUSTED, OPT_TRUSTED,
 	OPT_CRLFILE, OPT_CRL_DOWNLOAD, OPT_SHOW_CHAIN, OPT_VERBOSE,
 	OPT_V_ENUM,
@@ -82,6 +82,7 @@ enum options {
 OPTIONS verify_options[] = {
 	{ OPT_HELP_STR, 1, '-', "Usage: %s [options] cert.pem...\n" },
 	{ OPT_HELP_STR, 1, '-', "Valid options are:\n" },
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "verbose", OPT_VERBOSE, '-' },
 	{ "CApath", OPT_CAPATH, '/' },
 	{ "CAfile", OPT_CAFILE, '<' },
@@ -123,6 +124,7 @@ int verify_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(verify_options);
 			goto end;
 		case OPT_V_CASES:
@@ -233,7 +235,6 @@ int verify_main(int argc, char **argv)
 
 end:
 	if (ret == 1) {
-		opt_help(verify_options);
 		BIO_printf(bio_err, "Recognized usages:\n");
 		for(i = 0; i < X509_PURPOSE_get_count(); i++)
 			{
diff --git a/apps/version.c b/apps/version.c
index c89c752fef..2c62e4bb35 100644
--- a/apps/version.c
+++ b/apps/version.c
@@ -133,11 +133,12 @@
 #endif
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_B, OPT_D, OPT_F, OPT_O, OPT_P, OPT_V, OPT_A
 };
 
 OPTIONS version_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "a", OPT_A, '-', "Show all data" },
 	{ "b", OPT_B, '-', "Show build date" },
 	{ "d", OPT_D, '-', "Show configuration directory" },
@@ -160,6 +161,7 @@ int version_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 			opt_help(version_options);
 			goto end;
 		case OPT_B: date=1; break;
diff --git a/apps/x509.c b/apps/x509.c
index cdb246740f..05b3ec6291 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -100,7 +100,7 @@ static int force_version=2;
 #endif
 
 enum options {
-	OPT_ERR = -1, OPT_EOF = 0,
+	OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
 	OPT_INFORM, OPT_OUTFORM, OPT_KEYFORM, OPT_REQ, OPT_CAFORM,
 	OPT_CAKEYFORM, OPT_SIGOPT, OPT_DAYS, OPT_PASSIN, OPT_EXTFILE,
 	OPT_EXTENSIONS, OPT_IN, OPT_OUT, OPT_SIGNKEY, OPT_CA,
@@ -123,6 +123,7 @@ enum options {
 };
 
 OPTIONS x509_options[] = {
+	{ "help", OPT_HELP, '-', "Display this summary" },
 	{ "inform", OPT_INFORM, 'f', "Input format - default PEM (one of DER, NET or PEM)" },
 	{ "in", OPT_IN, '<', "Input file - default stdin" },
 	{" outform", OPT_OUTFORM, 'f', "Output format - default PEM (one of DER, NET or PEM)" },
@@ -243,6 +244,7 @@ int x509_main(int argc, char **argv)
 		switch (o) {
 		case OPT_EOF:
 		case OPT_ERR:
+		case OPT_HELP:
 err:
 			opt_help(x509_options);
 			goto end;