diff --git a/add-riscv64-support.patch b/add-riscv64-support.patch
new file mode 100644
index 0000000000000000000000000000000000000000..bb3245b6b4585dd34cbcd9599b489a2cb234cb3b
--- /dev/null
+++ b/add-riscv64-support.patch
@@ -0,0 +1,75 @@
+Author: misaka00251 <liuxin@iscas.ac.cn>
+Date:   Tue Jul 12 11:31:05 2022 +0800
+
+	Add riscv64 support.
+
+diff --git a/src/c/Makefile-linux-riscv64-64.make b/src/c/Makefile-linux-riscv64-64.make
+new file mode 100644
+index 0000000..4360f38
+--- /dev/null
++++ b/src/c/Makefile-linux-riscv64-64.make
+@@ -0,0 +1,64 @@
++# Copyright (c) 1999, 2007 Tanuki Software Inc.
++# 
++# Permission is hereby granted, free of charge, to any person
++# obtaining a copy of the Java Service Wrapper and associated
++# documentation files (the "Software"), to deal in the Software
++# without  restriction, including without limitation the rights
++# to use, copy, modify, merge, publish, distribute, sub-license,
++# and/or sell copies of the Software, and to permit persons to
++# whom the Software is furnished to do so, subject to the
++# following conditions:
++# 
++# The above copyright notice and this permission notice shall be
++# included in all copies or substantial portions of the Software.
++# 
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
++# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
++# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
++# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
++# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++# OTHER DEALINGS IN THE SOFTWARE.
++
++# This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
++# If you know how to fix it then please help out.
++COMPILE = gcc -O2 -g -pipe -Wall --pedantic
++
++INCLUDE=$(JAVA_HOME)/include
++
++DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
++
++wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
++
++libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
++
++BIN = ../../bin
++LIB = ../../lib
++
++all: init wrapper libwrapper.so
++
++clean:
++	rm -f *.o
++
++cleanall: clean
++	rm -rf *~ .deps
++	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
++
++init:
++	if test ! -d .deps; then mkdir .deps; fi
++
++wrapper: $(wrapper_SOURCE)
++	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++
++libwrapper.so: $(libwrapper_so_OBJECTS)
++	${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	>> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
diff --git a/java-service-wrapper.spec b/java-service-wrapper.spec
index cbef8a76b6ae619bda0920602ee17704d4eedc57..92474dd74aaf68d0491aa56214c9e574e12c2f3c 100644
--- a/java-service-wrapper.spec
+++ b/java-service-wrapper.spec
@@ -2,7 +2,7 @@
 %global hgrev   3290d306074a
 %global pname yaja-wrapper
 %if ! 0%{?__isa_bits}
-%ifarch x86_64 ia64 ppc64 sparc64 s390x alpha ppc64le aarch64
+%ifarch x86_64 ia64 ppc64 sparc64 s390x alpha ppc64le aarch64 riscv64
 %global __isa_bits 64
 %else
 %global __isa_bits 32
@@ -13,7 +13,7 @@
 %global cocoon  cocoon-2.0.4
 Name:                java-service-wrapper
 Version:             3.2.5
-Release:             1
+Release:             2
 Summary:             Java service wrapper
 License:             MIT
 URL:                 https://bitbucket.org/ivertex/yaja-wrapper
@@ -30,6 +30,7 @@ Patch2:              %{name}-3.2.4-docbuild.patch
 Patch3:              %{name}-3.2.5-rhbz1037144.patch
 Patch98:             Use-RPM_OPT_FLAGS-on-s390x.patch
 Patch99:             ppc64le-support.patch
+Patch100:            add-riscv64-support.patch
 BuildRequires:       ant javapackages-local gcc make
 %description
 The Java Service Wrapper enables a Java application to be run as a
@@ -51,6 +52,7 @@ sed -e 's|@LIBPATH@|%{_libdir}/%{name}|' %{PATCH1} | %{__patch} -p1 -F 0
 %patch3
 %patch98 -p1
 %patch99 -p1
+%patch100 -p1
 %if %{with docs}
 mkdir tools ; cd tools
 tar xf %{SOURCE3}
@@ -88,5 +90,8 @@ install -pm 755 lib/libwrapper.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 %license doc/license.txt
 
 %changelog
+* Wed Feb 22 2023 misaka00251 <liuxin@iscas.ac.cn> - 3.2.5-2
+- Fix riscv64 support.
+
 * Wed Oct 28 2020 shaoqiang kang <kangshaoqiang1@huawei.com> - 3.2.5-1
 - Package init