diff --git a/g10/ChangeLog b/g10/ChangeLog
index f4a769d29..d6ba72f3c 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-13  David Shaw  <dshaw@jabberwocky.com>
 
+	* keyserver.c (keyserver_work): Handle keyserver timeouts.
+
 	* pkclist.c (do_edit_ownertrust): Different prompt when we're
 	using direct trust since the meaning is different.
 
diff --git a/g10/keyserver.c b/g10/keyserver.c
index e0eebf320..b67a53f8c 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -1250,6 +1250,10 @@ keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
 		    keyserver->scheme,KEYSERVER_PROTO_VERSION);
 	  break;
 
+	case KEYSERVER_TIMEOUT:
+	  log_error(_("keyserver timed out\n"));
+	  break;
+
 	case KEYSERVER_INTERNAL_ERROR:
 	default:
 	  log_error(_("keyserver internal error\n"));