diff --git a/include/ChangeLog b/include/ChangeLog
index 771f05ee1..19930b054 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-13  David Shaw  <dshaw@jabberwocky.com>
+
+	* keyserver.h: Add KEYSERVER_TIMEOUT.
+
 2004-09-30  David Shaw  <dshaw@jabberwocky.com>
 
 	* util.h: Prototype destroy_dotlock().  From Werner on stable
diff --git a/include/keyserver.h b/include/keyserver.h
index 33c1b318b..35a8a0f1c 100644
--- a/include/keyserver.h
+++ b/include/keyserver.h
@@ -1,5 +1,5 @@
 /* keyserver.h
- * Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -35,6 +35,7 @@
 #define KEYSERVER_KEY_EXISTS       7 /* key already exists */
 #define KEYSERVER_KEY_INCOMPLETE   8 /* key incomplete (EOF) */
 #define KEYSERVER_UNREACHABLE      9 /* unable to contact keyserver */
+#define KEYSERVER_TIMEOUT         10 /* timeout while accessing keyserver */
 
 /* Must be 127 due to shell internal magic. */
 #define KEYSERVER_SCHEME_NOT_FOUND 127