diff --git a/config/sources/families/jethub.conf b/config/sources/families/jethub.conf
index 6c3cc8901..6590d436a 100644
--- a/config/sources/families/jethub.conf
+++ b/config/sources/families/jethub.conf
@@ -13,6 +13,12 @@ elif [[ "$BOARD" == "jethubj100" ]]; then
 	OFFSET=126
 fi
 
+# JetHub builds userspace tooling with c++ (gpp) toolchain in buildjethomecmds() below.
+# The C++ compiler is no longer included by default in the Armbian build system.
+# Enable the extension that brings includes it. It could've been an inline extension (eg: the function right here),
+# but having a core extension allows it to be pre-included in the Dockerfile generation and thus in the Docker images.
+enable_extension "c-plus-plus-compiler"
+
 uboot_custom_postprocess() {
 	if [[ "$BOARD" == "jethubj80" ]]; then
 		uboot_gxl_postprocess_ng "$SRC/cache/sources/amlogic-boot-fip/jethub-j80"
diff --git a/extensions/c-plus-plus-compiler.sh b/extensions/c-plus-plus-compiler.sh
new file mode 100644
index 000000000..0533187f3
--- /dev/null
+++ b/extensions/c-plus-plus-compiler.sh
@@ -0,0 +1,7 @@
+# The C++ compiler is no longer included by default in prepare-host.sh.
+# Enable this extension if you need a C++ compiler during the build.
+
+function add_host_dependencies__add_arm64_c_plus_plus_compiler() {
+	display_alert "Adding arm64 c++ compiler to host dependencies" "g++" "debug"
+	export EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} g++-aarch64-linux-gnu" # @TODO: convert to array later
+}