diff --git a/perl-xCAT/xCAT/DHCP/BootPolicy.pm b/perl-xCAT/xCAT/DHCP/BootPolicy.pm
index c24992d8c..98f1f0b62 100644
--- a/perl-xCAT/xCAT/DHCP/BootPolicy.pm
+++ b/perl-xCAT/xCAT/DHCP/BootPolicy.pm
@@ -36,6 +36,11 @@ sub kea_client_classes {
             test             => 'option[93].hex == 0x000b',
             'boot-file-name' => 'boot/grub2/grub2.aarch64',
         },
+        {
+            name             => 'xcat-riscv64',
+            test             => 'option[93].hex == 0x001b',
+            'boot-file-name' => 'boot/grub2/grub2.riscv64',
+        },
         {
             name             => 'xcat-ppc64',
             test             => 'option[93].hex == 0x000c',
diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index c6afb2adb..1505f4610 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -4467,6 +4467,9 @@ sub addnet
         push @netent,
           "    } else if option client-architecture = 00:0b { #aaarch64\n ";
         push @netent, "      filename \"boot/grub2/grub2.aarch64\";\n";
+        push @netent,
+          "    } else if option client-architecture = 00:1b { #riscv64 uefi\n ";
+        push @netent, "      filename \"boot/grub2/grub2.riscv64\";\n";
         push @netent,
           "    } else if option client-architecture = 00:0e { #OPAL-v3\n ";
         push @netent, "        option conf-file = \"http://$tftp$portsuffix/tftpboot/pxelinux.cfg/p/" . $net . "_" . $maskbits . "\";\n";