1 files changed, 8 insertions, 5 deletions
diff --git a/g10/options.h b/g10/options.h
index 1051d9ff0..7a405233b 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -125,11 +125,14 @@ struct
   int not_dash_escaped;
   int escape_from;
   int lock_once;
-  char *keyserver_uri;
-  char *keyserver_scheme;
-  char *keyserver_host;
-  char *keyserver_port;
-  char *keyserver_opaque;
+  struct keyserver_spec
+  {
+    char *uri;
+    char *scheme;
+    char *host;
+    char *port;
+    char *opaque;
+  } keyserver;
   struct
   {
     int verbose;