diff --git a/sm/ChangeLog b/sm/ChangeLog
index da70d0dcf..6da8abe5b 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-20  Werner Koch  <wk@gnupg.org>
+
+	* server.c (option_handler): New.
+	(gpgsm_server): Register it with assuan.
+
 2002-01-19  Werner Koch  <wk@gnupg.org>
 
 	* server.c (gpgsm_server): Use assuan_deinit_server and setup
diff --git a/sm/server.c b/sm/server.c
index 1ab7fc5d4..e05f5da0b 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -53,6 +53,17 @@ close_message_fd (CTRL ctrl)
     }
 }
 
+
+static int
+option_handler (ASSUAN_CONTEXT ctx, const char *key, const char *value)
+{
+  log_debug ("got option key=`%s' value=`%s'\n", key, value);
+  return 0;
+}
+
+
+
+
 static void
 reset_notify (ASSUAN_CONTEXT ctx)
 {
@@ -472,6 +483,7 @@ gpgsm_server (void)
   assuan_register_reset_notify (ctx, reset_notify);
   assuan_register_input_notify (ctx, input_notify);
   assuan_register_output_notify (ctx, output_notify);
+  assuan_register_option_handler (ctx, option_handler);
 
   assuan_set_pointer (ctx, &ctrl);
   ctrl.server_local = xcalloc (1, sizeof *ctrl.server_local);