diff --git a/NEWS b/NEWS
index ed37e3b40..08d6bfe6b 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ Noteworthy changes in version 2.1.0beta3
 
  * Support the SSH confirm flag.
 
+ * The Assuan commands KILLAGENT and KILLSCD are working again.
+
 
 Noteworthy changes in version 2.1.0beta2 (2011-03-08)
 -----------------------------------------------------
diff --git a/agent/command.c b/agent/command.c
index b03c786c1..4fbbfb56f 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -2259,7 +2259,12 @@ cmd_killagent (assuan_context_t ctx, char *line)
     return set_error (GPG_ERR_NOT_SUPPORTED, "no --use-standard-socket");
 
   ctrl->server_local->stopme = 1;
+#ifdef ASSUAN_FORCE_CLOSE
+  assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
+  return 0;
+#else
   return gpg_error (GPG_ERR_EOF);
+#endif
 }
 
 
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 4f2d2f258..45c9c7c0c 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-10  Werner Koch  <wk@g10code.com>
+
+	* command.c (cmd_killscd): Use the new assuan force close flag
+	if available.
+
 2011-08-08  Werner Koch  <wk@g10code.com>
 
 	* app-openpgp.c (do_decipher): Take care of accidentally passed
diff --git a/scd/command.c b/scd/command.c
index a579b24eb..9bb500523 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -1862,7 +1862,15 @@ cmd_killscd (assuan_context_t ctx, char *line)
   (void)line;
 
   ctrl->server_local->stopme = 1;
+#ifdef ASSUAN_FORCE_CLOSE
+  assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
+  return 0;
+#else
+  /* Actually returning an EOF does not anymore work with modern
+     Libassuan versions.  However we keep that non working code until
+     we make a Libassuan with the force close flag a requirement.  */
   return gpg_error (GPG_ERR_EOF);
+#endif
 }