diff --git a/common/util.h b/common/util.h
index c503717db..5002039d6 100644
--- a/common/util.h
+++ b/common/util.h
@@ -35,10 +35,19 @@
 #include <errno.h>  /* We need errno.  */
 #include <gpg-error.h> /* We need gpg_error_t and estream. */
 
-/* These error codes are used but not defined in the required
+/* These error codes might be used but not defined in the required
  * libgpg-error version.  Define them here.
  * Example: (#if GPG_ERROR_VERSION_NUMBER < 0x011500 // 1.21)
  */
+#if GPG_ERROR_VERSION_NUMBER < 0x012400 /* 1.36 */
+# define GPG_ERR_NO_AUTH          314
+# define GPG_ERR_BAD_AUTH         315
+#endif
+
+#if GPG_ERROR_VERSION_NUMBER < 0x011b00 /* 1.27 */
+# define GPG_ERR_WRONG_NAME       313
+#endif
+
 #if GPG_ERROR_VERSION_NUMBER < 0x011a00 /* 1.26 */
 # define GPG_ERR_UNKNOWN_FLAG     309
 # define GPG_ERR_INV_ORDER	  310
diff --git a/configure.ac b/configure.ac
index a2f4bd730..1d05d3991 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org])
 # build-aux/speedo.mk and Makefile.am
 AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg22", [swdb tag for this branch])
 
-NEED_GPG_ERROR_VERSION=1.24
+NEED_GPG_ERROR_VERSION=1.25
 
 NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.7.0