diff --git a/xCAT-client/pods/man8/makedhcp.8.pod b/xCAT-client/pods/man8/makedhcp.8.pod
index 32d2b52bf..95a16633c 100644
--- a/xCAT-client/pods/man8/makedhcp.8.pod
+++ b/xCAT-client/pods/man8/makedhcp.8.pod
@@ -21,7 +21,8 @@ B<makedhcp> B<[-h|--help]>
 =head1 DESCRIPTION
 
 The B<makedhcp> command creates and updates the DHCP configuration on the management node and service nodes. 
-The B<makedhcp> command is supported for both Linux and AIX clusters.
+The B<makedhcp> command is supported for both Linux and AIX clusters.  Note that it will intentionally not
+generate UEFI configuration if the OS indicated in nodetype.os is not UEFI supported, even if the OS being booted is shell.
 
 =over 3
 
diff --git a/xCAT-client/pods/man8/nodeset.8.pod b/xCAT-client/pods/man8/nodeset.8.pod
index bf6692de5..1265f9bb7 100644
--- a/xCAT-client/pods/man8/nodeset.8.pod
+++ b/xCAT-client/pods/man8/nodeset.8.pod
@@ -19,7 +19,9 @@ nodes or groups.  It tells xCAT what you want to happen the next time the
 nodes are booted up.  See  L<noderange(3)|noderange.3>.   B<nodeset>  accomplishes  this  by
 changing  the network boot files.  Each xCAT node always boots from the
 network and downloads a boot file with instructions on what  action  to
-take next.
+take next.  Should the nodetype.os indicates an OS that does not support UEFI
+boot, then the dhcp definition will not include UEFI boot directives, even
+if doing B<nodeset shell>.
 
 B<nodeset> will manipulate the boot configuration files of xnba, grub2, petitboot, yaboot and pxelinux.0.