diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4ee8dc450..548a3dda2 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-19  Werner Koch  <wk@g10code.com>
+
+	* tools.texi (Listing options): Describe new complect gpgconf type
+	"alias list".
+
 2008-06-16  Werner Koch  <wk@g10code.com>
 
 	* DETAILS (group): Document %ask-passphrase.
diff --git a/doc/tools.texi b/doc/tools.texi
index 5d33616be..ef67242bf 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -693,6 +693,11 @@ fingerprint.
 @item sec key (36)
 A @emph{string} that describes a certificate with a key by user ID,
 key ID or fingerprint.
+
+@item alias list (37)
+A @emph{string} that describes an alias list, like the one used with
+gpg's group option.  The list consists of a key, an equal sign and space
+separated values.
 @end table
 
 More types will be added in the future.  Please see the @var{alt-type}
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 9981212c7..7e851a249 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-19  Werner Koch  <wk@g10code.com>
+
+	* gpgconf-comp.c (GC_ARG_TYPE_ALIAS_LIST): New.
+	(gc_arg_type): Add fallbacl type.
+	(gc_options_gpg): Add option "group".
+
 2008-06-12  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpgconf-comp.c (gc_options_gpgsm): Add option keyserver.
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 5cda2f118..28ee5a016 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -234,6 +234,10 @@ typedef enum
     /* A user ID or key ID or fingerprint for a certificate with a key.  */
     GC_ARG_TYPE_SEC_KEY = 36,
 
+    /* A alias list made up of a key, an equal sign and a space
+       separated list of values.  */
+    GC_ARG_TYPE_ALIAS_LIST = 37,
+
     /* ADD NEW COMPLEX TYPE ENTRIES HERE.  */
 
     /* The number of the above entries.  */
@@ -281,6 +285,7 @@ static struct
     { GC_ARG_TYPE_STRING, "key fpr" },
     { GC_ARG_TYPE_STRING, "pub key" },
     { GC_ARG_TYPE_STRING, "sec key" },
+    { GC_ARG_TYPE_STRING, "alias list" },
   };
 
 
@@ -655,6 +660,9 @@ static gc_option_t gc_options_gpg[] =
    { "encrypt-to", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
      "gnupg", N_("|NAME|encrypt to user ID NAME as well"),
      GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
+   { "group", GC_OPT_FLAG_LIST, GC_LEVEL_ADVANCED,
+     "gnupg", N_("|SPEC|set up email aliases"),
+     GC_ARG_TYPE_ALIAS_LIST, GC_BACKEND_GPG },
    { "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
      "gnupg", "|FILE|read options from FILE",
      GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG },