diff --git a/ChangeLog b/ChangeLog
index a70971759..0e9c72c68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-09  Werner Koch  <wk@gnupg.org>
+
+	* configure.ac (NEED_GPG_ERROR_VERSION): Set to 0.7.
+
 2004-03-06  Werner Koch  <wk@gnupg.org>
 
 	Released 1.9.6.
diff --git a/TODO b/TODO
index f3a66f08c..1d12b7446 100644
--- a/TODO
+++ b/TODO
@@ -45,8 +45,6 @@ might want to have an agent context for each service request
 ** Check that all error code mapping is done.
 ** Remove the inter-module dependencies between gpgsm and keybox
 ** Add an source_of_key field
-** We need an error code GPG_ERR_NOT_LOCKED
-   It is already libgpg-error.
 
 * agent/gpg-agent.c
 ** A SIGHUP should also restart the scdaemon
diff --git a/configure.ac b/configure.ac
index 563e082d2..6d6918a9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_INIT(gnupg, 1.9.7-cvs, gnupg-devel@gnupg.org)
 # feel that the default check for a development version is not
 # sufficient.
 development_version=yes
-NEED_GPG_ERROR_VERSION=0.6
+NEED_GPG_ERROR_VERSION=0.7
 
 NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.1.93