diff --git a/sm/ChangeLog b/sm/ChangeLog
index 5ea6e0c2f..da70d0dcf 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-19  Werner Koch  <wk@gnupg.org>
+
+	* server.c (gpgsm_server): Use assuan_deinit_server and setup
+	assuan logging if enabled.
+	* call-agent.c (inq_ciphertext_cb): Don't show the session key in
+	an Assuan log file.
+
+	* gpgsm.c (my_strusage): Take bugreport address from configure.ac
+
 2002-01-15  Werner Koch  <wk@gnupg.org>
 
 	* import.c (gpgsm_import): Just do a basic cert check before
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 54c2d4e07..e7ecbd4c2 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -264,7 +264,9 @@ inq_ciphertext_cb (void *opaque, const char *keyword)
   struct cipher_parm_s *parm = opaque; 
   AssuanError rc;
 
+  assuan_begin_confidential (parm->ctx);
   rc = assuan_send_data (parm->ctx, parm->ciphertext, parm->ciphertextlen);
+  assuan_end_confidential (parm->ctx);
   return rc; 
 }
 
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 0ca22b639..bdbde7938 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -395,7 +395,7 @@ my_strusage( int level )
       break;
     case 13: p = VERSION; break;
     case 17: p = PRINTABLE_OS_NAME; break;
-    case 19: p = _("Please report bugs to <bug-gnupg@gnu.org>.\n");
+    case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
       break;
     case 1:
     case 40: p = _("Usage: gpgsm [options] [files] (-h for help)");
diff --git a/sm/server.c b/sm/server.c
index 9b78637be..1ab7fc5d4 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -478,6 +478,9 @@ gpgsm_server (void)
   ctrl.server_local->assuan_ctx = ctx;
   ctrl.server_local->message_fd = -1;
 
+  if (DBG_AGENT)
+    assuan_set_log_stream (ctx, log_get_stream ());
+
   for (;;)
     {
       rc = assuan_accept (ctx);
@@ -502,7 +505,7 @@ gpgsm_server (void)
   gpgsm_release_certlist (ctrl.server_local->recplist);
   ctrl.server_local->recplist = NULL;
 
-  assuan_deinit_pipe_server (ctx);
+  assuan_deinit_server (ctx);
 }