diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index fc97d56b88a..459c83368c1 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -55,7 +55,7 @@ else
 fi
 makedepends="zlib-devel libzstd-devel"
 depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision} libatomic-devel-${version}_${revision}"
 checkdepends="dejagnu"
 
 subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -125,6 +125,8 @@ case "$XBPS_TARGET_MACHINE" in
 	mipshf-musl) _triplet="mips-linux-muslhf";;
 	mipsel-musl) _triplet="mipsel-linux-musl";;
 	mipselhf-musl) _triplet="mipsel-linux-muslhf";;
+	riscv64) _triplet="riscv64-linux-gnu";;
+	riscv64-musl) _triplet="riscv64-linux-musl";;
 esac
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	 depends+=" musl-devel";;
@@ -143,6 +145,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 case "$XBPS_TARGET_MACHINE" in
 	mips*) ;;
+	riscv*) ;;
 	x86_64*|i686) subpackages+=" libitm libitm-devel";;
 	*) subpackages+=" libitm libitm-devel";;
 esac