diff --git a/gcc.spec b/gcc.spec
index fe28ce5..fd30208 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -264,6 +264,8 @@ Patch15: gcc9-utf-array-test.patch
 Patch16: gcc9-aarch64-bootstrap.patch
 Patch17: gcc9-pr88927.patch
 
+Patch30: libphobos-enable-riscv.patch
+
 Patch1000: nvptx-tools-no-ptxas.patch
 Patch1001: nvptx-tools-build.patch
 Patch1002: nvptx-tools-glibc.patch
@@ -848,6 +850,8 @@ to NVidia PTX capable devices if available.
 %patch16 -p0 -b .aarch64-bootstrap~
 %patch17 -p0 -b .pr88927~
 
+%patch30 -p1 -b .libphobos-riscv~
+
 cd nvptx-tools-%{nvptx_tools_gitrev}
 %patch1000 -p1 -b .nvptx-tools-no-ptxas~
 %patch1001 -p1 -b .nvptx-tools-build~
@@ -1344,6 +1348,8 @@ find %{buildroot} -name \*.la | xargs rm -f
 
 mv %{buildroot}%{_prefix}/%{_lib}/libgfortran.spec $FULLPATH/
 %if %{build_d}
+find %{buildroot} -name libgphobos.spec
+find %{buildroot}
 mv %{buildroot}%{_prefix}/%{_lib}/libgphobos.spec $FULLPATH/
 %endif
 %if %{build_libitm}
diff --git a/libphobos-enable-riscv.patch b/libphobos-enable-riscv.patch
new file mode 100644
index 0000000..7b4ed31
--- /dev/null
+++ b/libphobos-enable-riscv.patch
@@ -0,0 +1,13 @@
+diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
+index 2b2a97468..f8775b712 100644
+--- a/libphobos/configure.tgt
++++ b/libphobos/configure.tgt
+@@ -30,6 +30,8 @@ case "${target}" in
+ 	;;
+   x86_64-*-linux* | i?86-*-linux*)
+ 	;;
++  riscv*-*-linux*)
++	;;
+   *)
+ 	UNSUPPORTED=1
+ 	;;