diff --git a/doc/tools.texi b/doc/tools.texi
index 2e64ba7ab..208c07cb9 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -300,6 +300,7 @@ Update all configuration files with values taken from the global
 configuration file (usually @file{/etc/gnupg/gpgconf.conf}).
 
 @item --list-dirs [@var{names}]
+@itemx -L
 Lists the directories used by @command{gpgconf}.  One directory is
 listed per line, and each line consists of a colon-separated list where
 the first field names the directory type (for example @code{sysconfdir})
@@ -333,8 +334,8 @@ force an update of that file this command can be used:
        gpg-connect-agent --dirmngr 'loadswdb --force' /bye
 @end example
 
-
 @item --reload [@var{component}]
+@itemx -R
 @opindex reload
 Reload all or the given component. This is basically the same as
 sending a SIGHUP to the component.  Components which don't support
@@ -351,6 +352,7 @@ may use this command to ensure that they are started.  Using "all" for
 @var{component} launches all components which are daemons.
 
 @item --kill [@var{component}]
+@itemx -K
 @opindex kill
 Kill the given component that runs as a daemon, including
 @command{gpg-agent}, @command{dirmngr}, and @command{scdaemon}.  A
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index a426c2481..45c23edbb 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -46,6 +46,10 @@ enum cmd_and_opt_values
     oRuntime    = 'r',
     oComponent  = 'c',
     oNull       = '0',
+    aListDirs   = 'L',
+    aKill       = 'K',
+    aReload     = 'R',
+
     oNoVerbose	= 500,
     oHomedir,
     oBuilddir,
@@ -61,15 +65,12 @@ enum cmd_and_opt_values
     aListConfig,
     aCheckConfig,
     aQuerySWDB,
-    aListDirs,
     aLaunch,
-    aKill,
     aCreateSocketDir,
     aRemoveSocketDir,
     aApplyProfile,
-    aReload,
-    aShowConfigs,
-    aShowVersions
+    aShowVersions,
+    aShowConfigs
   };