diff --git a/java-9-openjdk.spec b/java-9-openjdk.spec
index da443fe..a0ef459 100644
--- a/java-9-openjdk.spec
+++ b/java-9-openjdk.spec
@@ -491,7 +491,9 @@ exit 0
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/tnameserv
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/unpack200
 %dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
+%ifnarch riscv64
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
+%endif
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jrt-fs.jar
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/modules
@@ -526,7 +528,9 @@ exit 0
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libnio.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libprefs.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/librmi.so
+%ifnarch riscv64
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsaproc.so
+%endif
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsctp.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libunpack.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
@@ -856,7 +860,7 @@ Provides: java-%{javaver}-%{origin}-accessiblity = %{epoch}:%{version}-%{release
 
 Name:    java-%{majorver}-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: 6.5.riscv64%{?dist}
+Release: 6.6.riscv64%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -1858,6 +1862,9 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Sun Sep 30 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:9.0.4.11-6.6.riscv64
+- Exclude classlist and libsaproc.so on RISC-V (riscv64)
+
 * Thu Sep 27 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:9.0.4.11-6.5.riscv64
 - Remove ppc_stack_overflow_fix.patch again
 - Apply changes from JDK-8194739