diff --git a/sm/ChangeLog b/sm/ChangeLog
index e6634689f..6d7f98ac6 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-13  Marcus Brinkmann  <marcus@ulysses.g10code.com>
+
+	* call-dirmngr.c (prepare_dirmngr): Fix error code to ignore.
+
 2008-06-12  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpgsm.h (struct keyserver_spec): New struct.
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index 35e937956..4cbc0191e 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -168,7 +168,7 @@ prepare_dirmngr (ctrl_t ctrl, assuan_context_t ctx, gpg_error_t err)
       line[DIM (line) - 1] = 0;
 
       err = assuan_transact (ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
-      if (gpg_err_code (err) == GPG_ERR_UNKNOWN_OPTION)
+      if (gpg_err_code (err) == GPG_ERR_ASS_UNKNOWN_CMD)
 	err = 0;  /* Allow the use of old dirmngr versions.  */
 
       server = server->next;