diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm
index c4fb822a0..28a544d5b 100755
--- a/xCAT-genesis-builder/buildrpm
+++ b/xCAT-genesis-builder/buildrpm
@@ -133,7 +133,6 @@ elif [ $BUILDARCH = "ppc64" ]; then
            sed -i 's/ mkreiserfs//' $DRACUTMODDIR/install
            sed -i 's/ reiserfstune//' $DRACUTMODDIR/install
            sed -i 's/ vconfig//' $DRACUTMODDIR/install
-           sed -i 's/ ntp-wait//' $DRACUTMODDIR/install
         fi
         sed -i 's/ efibootmgr//' $DRACUTMODDIR/install
         sed -i 's/ dmidecode//' $DRACUTMODDIR/install
@@ -145,6 +144,20 @@ libnss_pkgname=`find /usr/lib64/ -name libnss_dns-2*.so | xargs basename`
 sed -i "s/\/lib64\/libnss_dns-2.12.so/\/usr\/lib64\/$libnss_pkgname/g" $DRACUTMODDIR/install
 sed -i 's/\/lib64\/libnss_dns.so.2/\/usr\/lib64\/libnss_dns.so.2/' $DRACUTMODDIR/install
 
+# Based on cmdlist_check, makesure the commands are included in $DRACUTMODDIR/install
+if [ -e "${DRACUTMODDIR}/cmdlist_check" ]; then
+    miss_cmd=0
+    for cmd in `cat ${DRACUTMODDIR}/cmdlist_check`; do
+        if ! grep $cmd $DRACUTMODDIR/install; then
+            echo "ERROR: The required $cmd is not included in the install file to build the Genesis base package"
+            miss_cmd=1
+        fi
+    done
+    if [ "$miss_cmd" = 1 ]; then
+        exit 1
+    fi
+fi
+
 mkdir -p /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs 
 
 # run dracut
diff --git a/xCAT-genesis-builder/cmdlist_check b/xCAT-genesis-builder/cmdlist_check
new file mode 100644
index 000000000..ad9795861
--- /dev/null
+++ b/xCAT-genesis-builder/cmdlist_check
@@ -0,0 +1 @@
+ntp-wait