diff --git a/gdb.spec b/gdb.spec
index d946bcb..172b100 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -1078,11 +1078,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/python/gdb/backtrace.py
 rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/python/gdb/command/backtrace.py
 %endif
 
-# The manpage is installed even if gdbserver is not supported by target
-%ifarch sparc sparcv9 riscv64
-rm $RPM_BUILD_ROOT%{_mandir}/*/gdbserver.1*
-%endif
-
 %files
 # File must begin with "/": {GFDL,COPYING3,COPYING,COPYING.LIB,COPYING3.LIB}
 %if 0%{!?el6:1}
@@ -1129,7 +1124,7 @@ rm $RPM_BUILD_ROOT%{_mandir}/*/gdbserver.1*
 %{_bindir}/gdb-add-index
 %endif # 0%{?_build_minimal}
 
-%ifnarch sparc sparcv9 riscv64
+%ifnarch sparc sparcv9
 %files gdbserver
 %{_bindir}/gdbserver
 %{_mandir}/*/gdbserver.1*