diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index 809a872..08c8b58 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.0.15
-Release:        18%{?dist}
+Release:        18.0.riscv64%{?dist}
 Summary:        Defines API to support an alternative invocation mechanism
 License:        ASL 2.0
 Group:          Applications/System
@@ -16,6 +16,7 @@ Patch2:         apache-commons-daemon-secondary.patch
 # backport from http://svn.apache.org/viewvc?view=revision&revision=1533345
 # https://issues.apache.org/jira/browse/DAEMON-308
 Patch3:         apache-commons-daemon-aarch64.patch
+Patch4:         commons-daemon-1.0.15-src-riscv64.patch
 BuildRequires:  maven-local
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
@@ -57,6 +58,7 @@ BuildArch:      noarch
 %patch1 -p1 -b .java_os
 %patch2 -p1 -b .secondary
 %patch3 -p1 -b .aarch64
+%patch4 -p1 -b .riscv64
 
 # remove java binaries from sources
 rm -rf src/samples/build/
@@ -106,6 +108,9 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
 
 
 %changelog
+* Mon Sep 17 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1.0.15-18.0.riscv64
+- Add support for RISC-V (riscv64)
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.15-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/commons-daemon-1.0.15-src-riscv64.patch b/commons-daemon-1.0.15-src-riscv64.patch
new file mode 100644
index 0000000..391a0b3
--- /dev/null
+++ b/commons-daemon-1.0.15-src-riscv64.patch
@@ -0,0 +1,19 @@
+diff --git a/src/native/unix/support/apsupport.m4 b/src/native/unix/support/apsupport.m4
+index d9e94fb..51819b4 100644
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
+@@ -177,7 +177,13 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
+   aarch64*)
+     CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
+     supported_os="aarch64"
+-    HOST_CPU=aarch64;;
++    HOST_CPU=aarch64
++    ;;
++  riscv64)
++    CFLAGS="$CFLAGS -DCPU=\\\"riscv64\\\""
++    supported_os="riscv64"
++    HOST_CPU=riscv64
++    ;;
+   *)
+     AC_MSG_RESULT([failed])
+     AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;