diff --git a/ChangeLog b/ChangeLog
index e38f1a0f7..3e67c1020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-27  David Shaw  <dshaw@jabberwocky.com>
+
+	* NEWS: Note --enable-key-cache and OpenBSD/i386 and HPPA fixes.
+
+	* README, configure.ac: Add --enable-key-cache=SIZE configure
+	option.  This sets the key/uid cache size.  Default is 4096.
+
 2003-12-28  David Shaw  <dshaw@jabberwocky.com>
 
 	* configure.ac: Include stdio.h when checking for bzlib.h.
diff --git a/NEWS b/NEWS
index 51257cc67..caf5e9d34 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 Noteworthy changes in version 1.2.5 (unreleased)
 ------------------------------------------------
 
+    * Some performance improvements with large keyrings.
+
+    * Some portability fixes for the OpenBSD/i386 and HPPA platforms.
+
+
 Noteworthy changes in version 1.2.4 (2003-12-23)
 ------------------------------------------------
 
@@ -25,6 +30,7 @@ Noteworthy changes in version 1.2.4 (2003-12-23)
     * A Russian translation is included again as well as a new
       Belarusian translation.
 
+
 Noteworthy changes in version 1.2.3 (2003-08-21)
 ------------------------------------------------
 
diff --git a/README b/README
index 686141312..5cbc8e88e 100644
--- a/README
+++ b/README
@@ -546,6 +546,13 @@
                     Enable read-only SHA-384 and SHA-512 digest
                     support.
 
+     --enable-key-cache=SIZE
+                    Set the internal key and UID cache size.  This has
+                    a significant impact on performance with large
+                    keyrings.  The default is 4096, but for use on
+                    platforms where memory is an issue, it can be set
+                    as low as 5.
+
 
     Installation Problems
     ---------------------
diff --git a/configure.ac b/configure.ac
index 66644a73d..65bfa6cf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,6 +241,30 @@ AC_ARG_WITH(included-zlib,
 [g10_force_zlib=yes], [g10_force_zlib=no] )
 AC_MSG_RESULT($g10_force_zlib)
 
+dnl
+dnl Check for the key/uid cache size.  This can't be zero, but can be
+dnl pretty small on embedded systems.
+dnl
+AC_MSG_CHECKING([for the size of the key and uid cache])
+AC_ARG_ENABLE(key-cache,
+	AC_HELP_STRING([--enable-key-cache=SIZE],[Set key cache to SIZE (default 4096)]),,enableval=4096)
+
+if test "$enableval" = "no"; then
+   enableval=5
+elif test "$enableval" = "yes" || test "$enableval" = ""; then
+   enableval=4096
+fi
+
+changequote(,)dnl
+key_cache_size=`echo "$enableval" | sed 's/[A-Za-z]//g'`
+changequote([,])dnl
+
+if test "$enableval" != "$key_cache_size" || test "$key_cache_size" -lt 5; then
+   AC_MSG_ERROR([invalid key-cache size])
+fi
+
+AC_MSG_RESULT($key_cache_size)
+AC_DEFINE_UNQUOTED(PK_UID_CACHE_SIZE,$key_cache_size,[Size of the key and UID caches])
 
 dnl
 dnl Check whether we want to use Linux capabilities
@@ -290,7 +314,6 @@ GNUPG_CHECK_DOCBOOK_TO_TEXI
 MPI_OPT_FLAGS=""
 
 
-
 try_gettext=yes
 have_dosish_system=no
 case "${target}" in