diff --git a/sm/ChangeLog b/sm/ChangeLog
index b5e5ba264..98f9a4e7a 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,5 +1,7 @@
 2006-12-20  Marcus Brinkmann  <marcus@g10code.de>
 
+	* server.c (gpgsm_server): Release CTRL->server_local.
+
 	* base64.c: Add new members READER and WRITER in union U2.
 	(gpgsm_create_reader): Initialise CTX->u2.reader.
 	(gpgsm_destroy_reader): Invoke ksba_reader_release.  Return early
diff --git a/sm/server.c b/sm/server.c
index 0bf85e095..f922a0f2c 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -967,6 +967,7 @@ gpgsm_server (certlist_t default_recplist)
   ctrl.server_local->recplist = NULL;
   gpgsm_release_certlist (ctrl.server_local->signerlist);
   ctrl.server_local->signerlist = NULL;
+  xfree (ctrl.server_local);
 
   assuan_deinit_server (ctx);
 }