diff --git a/bin/account-manager.pl.in b/bin/account-manager.pl.in
index 04f06dba7b44f30a763a0ee61e20fb443ca5ab77..a235c1b15f403f4aa92787ff3a0e40fe9db3415a 100755
--- a/bin/account-manager.pl.in
+++ b/bin/account-manager.pl.in
@@ -348,38 +348,56 @@ account-manager.pl - Command line client to the Test IdP Account manager
 
 =head1 SYNOPSIS
 
-B<account-manager.pl> B<add_account>
-S<B<--profile> I<string>>
-S<B<--sp_entityid> I<string>>
-
-B<account-manager.pl> B<list_accounts>
-S<[B<--profile> I<string>]>
-S<[B<--sp_entityid> I<string>]>
-[B<--expired>] [B<--delete>]
-
-B<account-manager.pl> B<parse_metadata>
-S<[B<--sp_entityid> I<string>]>
-
-B<account-manager.pl> B<add_service>
-S<B<--sp_entityid> I<string>>
-S<B<--contact> I<string>>
-S<[B<--displayname> I<string>]>
-
-B<account-manager.pl> B<list_services>
-[B<--delete>]
-
-B<account-manager.pl> B<list_tokens>
-S<B<--sp_entityid> I<string>>
-S<[B<--token> I<string>]>
-[B<--expired>] [B<--delete>]
-
-B<account-manager.pl> B<get_token>
-S<B<--sp_entityid> I<string>>
-S<[B<--token> I<string>]>
-
-B<account-manager.pl> B<add_token>
-S<B<--sp_entityid> I<string>>
-S<B<--email_address> I<string>>
+account-manager.pl [options] add_account
+
+  Options:
+    --profile <string>
+    --sp_entityid <string>
+
+account-manager.pl [options] list_accounts
+
+  Options:
+    --profile <string>
+    --sp_entityid <string>
+    --expired
+    --delete
+
+account-manager.pl [options] parse_metadata
+
+  Options:
+    --sp_entityid <string>
+
+account-manager.pl [options] add_service
+
+  Options:
+    --sp_entityid <string>
+    --contact <string>
+    --displayname <string>
+
+account-manager.pl [options] list_services
+
+  Options:
+    --delete
+
+account-manager.pl [options] list_tokens
+
+  Options:
+    --sp_entityid <string>
+    --token <string>
+    --expired
+    --delete
+
+account-manager.pl [options] get_token
+
+  Options:
+    --sp_entityid <string>
+    --token <string>
+
+account-manager.pl [options] add_token
+
+  Options:
+    --sp_entityid <string>
+    --email_address <string>
 
 =head1 DESCRIPTION