diff --git a/gcc-aarch64/APKBUILD b/gcc-aarch64/APKBUILD
index 4a8da487e..3c03c491b 100644
--- a/gcc-aarch64/APKBUILD
+++ b/gcc-aarch64/APKBUILD
@@ -28,7 +28,7 @@ _gccrel=$pkgver-r$pkgrel
 depends="isl binutils-aarch64"
 makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64"
-subpackages="g++-aarch64"
+subpackages="g++-aarch64:gpp"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
 replaces="libstdc++ binutils"
 
@@ -129,7 +129,6 @@ fi
 
 _languages=c
 if $LANG_CXX; then
-       subpackages="$subpackages g++$_target:gpp"
 	_languages="$_languages,c++"
 fi
 if $LANG_OBJC; then
diff --git a/gcc-armhf/APKBUILD b/gcc-armhf/APKBUILD
index e7b9b4b33..7f63fc08e 100644
--- a/gcc-armhf/APKBUILD
+++ b/gcc-armhf/APKBUILD
@@ -28,7 +28,7 @@ _gccrel=$pkgver-r$pkgrel
 depends="isl binutils-armhf"
 makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
-subpackages="g++-armhf"
+subpackages="g++-armhf:gpp"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
 replaces="libstdc++ binutils"
 
@@ -129,7 +129,6 @@ fi
 
 _languages=c
 if $LANG_CXX; then
-       subpackages="$subpackages g++$_target:gpp"
 	_languages="$_languages,c++"
 fi
 if $LANG_OBJC; then