diff --git a/packages/gpgme/build.sh b/packages/gpgme/build.sh
index a25dc343e..ea3ef5d05 100644
--- a/packages/gpgme/build.sh
+++ b/packages/gpgme/build.sh
@@ -3,16 +3,16 @@ TERMUX_PKG_DESCRIPTION="Library designed to make access to GnuPG easier"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.15.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad
 TERMUX_PKG_DEPENDS="gnupg (>= 2.2.9-1), libassuan, libgpg-error"
 TERMUX_PKG_BREAKS="gpgme-dev"
 TERMUX_PKG_REPLACES="gpgme-dev"
 # Use "--disable-gpg-test" to avoid "No rule to make target `../../src/libgpgme-pthread.la":
-# Use "--enable-languages=no" to only build the C library.
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-gpg-test
---enable-languages=no
+--enable-languages=cpp
 --with-gpg=$TERMUX_PREFIX/bin/gpg2
 --without-g13
 --without-gpgconf
diff --git a/packages/gpgme/gpgmepp-static.subpackage.sh b/packages/gpgme/gpgmepp-static.subpackage.sh
new file mode 100644
index 000000000..f3a4eb8cf
--- /dev/null
+++ b/packages/gpgme/gpgmepp-static.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Static libraries for gpgmepp"
+TERMUX_SUBPKG_DEPENDS="gpgmepp"
+TERMUX_SUBPKG_INCLUDE="
+lib/libgpgmepp.la
+lib/libgpgmepp.a
+"
diff --git a/packages/gpgme/gpgmepp.subpackage.sh b/packages/gpgme/gpgmepp.subpackage.sh
new file mode 100644
index 000000000..9a46c8478
--- /dev/null
+++ b/packages/gpgme/gpgmepp.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="Programmatic C++ library interface to GnuPG"
+TERMUX_SUBPKG_INCLUDE="
+lib/libgpgmepp.so
+lib/cmake/Gpgmepp
+include/gpgme++
+"