diff --git a/ChangeLog b/ChangeLog
index 3e67c1020..82bbf14f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-25  David Shaw  <dshaw@jabberwocky.com>
+
+	* configure.ac: Update copyright.
+
+	* README: Update version.
+
+	* NEWS: Note --max-output, --list-config, --min-cert-level, and
+	AIX fix.
+
 2004-01-27  David Shaw  <dshaw@jabberwocky.com>
 
 	* NEWS: Note --enable-key-cache and OpenBSD/i386 and HPPA fixes.
diff --git a/NEWS b/NEWS
index caf5e9d34..83461d650 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,23 @@
 Noteworthy changes in version 1.2.5 (unreleased)
 ------------------------------------------------
 
-    * Some performance improvements with large keyrings.
+    * New --min-cert-level option to disregard key signatures that are
+      under a specified level.
 
-    * Some portability fixes for the OpenBSD/i386 and HPPA platforms.
+    * New --max-output option to limit the amount of plaintext output
+      generated by GnuPG.  This option can be used by programs which
+      call GnuPG to process messages that may result in plaintext
+      larger than the calling program is prepared to handle.  This is
+      sometimes called a "Decompression Bomb".
+
+    * New --list-config command for frontends and other programs that
+      call GnuPG.  See doc/DETAILS for the specifics of this.
+
+    * Some performance improvements with large keyrings.  See
+      --enable-key-cache=SIZE in the README file for details.
+
+    * Some portability fixes for the OpenBSD/i386, HPPA, and AIX
+      platforms.
 
 
 Noteworthy changes in version 1.2.4 (2003-12-23)
diff --git a/README b/README
index 5cbc8e88e..9ddfaf828 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
 
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
-			    Version 1.2.4
+			    Version 1.2.5
 
-	     Copyright 1998, 1999, 2000, 2001, 2002, 2003
-		    Free Software Foundation, Inc.
+	    Copyright 1998, 1999, 2000, 2001, 2002, 2003,
+		 2004 Free Software Foundation, Inc.
 
     This file is free software; as a special exception the author
     gives unlimited permission to copy and/or distribute it, with or
@@ -37,7 +37,7 @@
     more information on this subject, including what to do if you are
     legally entitled to use IDEA.
 
-    The default public key algorithms are DSA and ElGamal, but RSA is
+    The default public key algorithms are DSA and Elgamal, but RSA is
     also supported.  Symmetric algorithms available are AES (with 128,
     192, and 256 bit keys), 3DES, Blowfish, CAST5 and Twofish.  Digest
     algorithms available are MD5, RIPEMD/160, SHA-1, SHA-256, SHA-384,
diff --git a/configure.ac b/configure.ac
index 65bfa6cf8..e18451110 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Configure.ac script for GnuPG
-dnl Copyright (C) 1998, 1999, 2000, 2001, 2002,
-dnl               2003 Free Software Foundation, Inc.
+dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
+dnl               2004 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GnuPG.
 dnl