diff --git a/Makefile.am b/Makefile.am
index 5382171..d5e72c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,6 @@ yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) \
 		$(top_srcdir)/configure.ac
 	$(HELP2MAN) --no-info \
 		--name="Yubico PIV tool" \
-		--help-option="--detailed-help" \
 		--output=$@ $(top_builddir)/yubico-piv-tool$(EXEEXT)
 
 # Maintainer rules.
diff --git a/cmdline.ggo b/cmdline.ggo
index 80c25af..006ffae 100644
--- a/cmdline.ggo
+++ b/cmdline.ggo
@@ -30,10 +30,12 @@ option "key" k "Authentication key to use" string optional default="010203040506
 option "action" a "Action to take" values="version","generate","set-mgm-key",
        "reset","pin-retries","import-key","import-certificate","set-chuid",
        "request-certificate","verify-pin","change-pin","change-puk","unblock-pin",
-       "selfsign-certificate" enum multiple details="
+       "selfsign-certificate" enum multiple
+text   "
        Multiple actions may be given at once and will be executed in order
        for example --action=verify-pin --action=request-certificate\n"
-option "slot" s "What key slot to operate on" values="9a","9c","9d","9e" enum optional details="
+option "slot" s "What key slot to operate on" values="9a","9c","9d","9e" enum optional
+text   "
        9a is for PIV Authentication
        9c is for Digital Signature (PIN always checked)
        9d is for Key Management
@@ -46,7 +48,9 @@ option "input" i "Filename to use as input, - for stdin" string optional default
 option "output" o "Filename to use as output, - for stdout" string optional default="-"
 option "key-format" K "Format of the key being read/written" values="PEM","PKCS12" enum optional default="PEM"
 option "password" p "Password for decryption of private key file" string optional
-option "subject" S "The subject to use for certificate request" string optional details="
-       The subject must be written as /CN=host.example.com/OU=test/O=example.com/\n"
+option "subject" S "The subject to use for certificate request" string optional
+text   "
+       The subject must be written as:
+       /CN=host.example.com/OU=test/O=example.com/\n"
 option "pin" P "Pin/puk code for verification" string optional
 option "new-pin" N "New pin/puk code for changing" string optional dependon="pin"