diff --git a/modules/gpg2 b/modules/gpg2
index e2f6175c..2a40c976 100644
--- a/modules/gpg2
+++ b/modules/gpg2
@@ -1,10 +1,10 @@
 modules-$(CONFIG_GPG2) += gpg2
 
-gpg2_version := 2.2.21
+gpg2_version := 2.4.0
 gpg2_dir := gnupg-$(gpg2_version)
 gpg2_tar := gnupg-$(gpg2_version).tar.bz2
 gpg2_url := https://www.gnupg.org/ftp/gcrypt/gnupg/$(gpg2_tar)
-gpg2_hash := 61e83278fb5fa7336658a8b73ab26f379d41275bb1c7c6e694dd9f9a6e8e76ec
+gpg2_hash := 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483
 
 # For reproducibility reasons we have to override the exec_prefix
 # and datarootdir on the configure line so that the Makefiles will
@@ -41,6 +41,7 @@ gpg2_configure := \
 	--disable-wks-tools \
 	--disable-gnutls \
 	--disable-dirmngr \
+	--disable-ntbtls \
 	--disable-zip \
 	--disable-sqlite \
 	--disable-gpgsm \
@@ -53,6 +54,6 @@ gpg2_target := $(MAKE_JOBS) \
 		DESTDIR="$(INSTALL)" \
 		install
 
-gpg2_output := g10/gpg agent/gpg-agent scd/scdaemon
+gpg2_output := g10/gpg agent/gpg-agent scd/scdaemon tools/gpg-connect-agent
 
 gpg2_depends := libgpg-error libgcrypt libksba libassuan npth libusb-compat $(musl_dep)
diff --git a/patches/gpg2-2.2.21.patch b/patches/gpg2-2.2.21.patch
deleted file mode 100644
index 9591e6b9..00000000
--- a/patches/gpg2-2.2.21.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -u --recursive /home/tlaurion/build/clean/gnupg-2.2.10/configure gnupg-2.2.10/configure
---- /home/tlaurion/build/clean/gnupg-2.2.10/configure	2016-08-17 09:20:25.000000000 -0400
-+++ gnupg-2.2.10/configure	2018-01-20 16:55:14.502067084 -0500
-@@ -572,7 +572,7 @@
- ac_clean_files=
- ac_config_libobj_dir=.
- LIBOBJS=
--cross_compiling=no
-+cross_compiling=yes
- subdirs=
- MFLAGS=
- MAKEFLAGS=
-diff -u --recursive gnupg-2.2.10/common/ttyio.c gnupg-2.2.10/common/ttyio.c.mod 
---- gnupg-2.2.10/common/ttyio.c	2017-08-28 06:22:54.000000000 -0400
-+++ gnupg-2.2.10/common/ttyio.c	2018-09-18 23:00:07.386250017 -0400
-@@ -190,7 +190,9 @@
- #elif defined (HAVE_W32CE_SYSTEM)
-     ttyfp = stderr;
- #else
--    ttyfp = batchmode? stderr : fopen (tty_get_ttyname (), "r+");
-+    //ttyfp = batchmode? stderr : fopen( tty_get_ttyname (), "r+");
-+    ttyfp = stderr;
-+
-     if( !ttyfp ) {
- 	log_error("cannot open '%s': %s\n", tty_get_ttyname (),
-                   strerror(errno) );
-
diff --git a/patches/gpg2-2.4.0.patch b/patches/gpg2-2.4.0.patch
new file mode 100644
index 00000000..ef94377b
--- /dev/null
+++ b/patches/gpg2-2.4.0.patch
@@ -0,0 +1,23 @@
+diff -u --recursive gnupg-2.4.0/configure gnupg-2.4.0/configure
+--- gnupg-2.4.0/configure	2016-08-17 09:20:25.000000000 -0400
++++ gnupg-2.4.0/configure	2018-01-20 16:55:14.502067084 -0500
+@@ -572,7 +572,7 @@
+ ac_clean_files=
+ ac_config_libobj_dir=.
+ LIBOBJS=
+-cross_compiling=no
++cross_compiling=yes
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+--- gnupg-2.4.0/common/ttyio.c.orig	2023-03-24 02:37:40.384435064 +0100
++++ gnupg-2.4.0/common/ttyio.c	2023-03-24 02:38:21.825961221 +0100
+@@ -186,7 +186,7 @@
+   SetConsoleMode (con.out, DEF_OUTMODE);
+ 
+ #else /* Unix */
+-  ttyfp = batchmode? stderr : fopen (tty_get_ttyname (), "r+");
++  ttyfp = stderr;
+   if (!ttyfp)
+     {
+       log_error ("cannot open '%s': %s\n", tty_get_ttyname (), strerror(errno));