diff --git a/docs/source/conf.py b/docs/source/conf.py
index 312deac0d..b51055b4e 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -59,7 +59,7 @@ author = u'IBM Corporation'
 # The short X.Y version.
 version = '2'
 # The full version, including alpha/beta/rc tags.
-release = '2.14'
+release = '2.14.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/source/overview/xcat2_release.rst b/docs/source/overview/xcat2_release.rst
index 837edc12f..ee7b62dfd 100644
--- a/docs/source/overview/xcat2_release.rst
+++ b/docs/source/overview/xcat2_release.rst
@@ -14,6 +14,20 @@ xCAT 2.14.x
 |xCAT                             |New OS         |New          |New Feature                       |
 |Version                          |               |Hardware     |                                  |
 +=================================+===============+=============+==================================+
+|| xCAT 2.14.1                    |- RHV4.2 +     |             |- OpenBMC in python enhance:      |
+|| 2018/6/1                       |  RHEL7.5 + p8 |             |                                  |
+||                                |               |             |  rinv enhance,issue #5176        |
+| `2.14.1 Release Notes <https:// |               |             |                                  |
+| github.com/xcat2/xcat-core/wiki |               |             |- Cumulus Switch OS - syncfile    |
+| /XCAT_2.14.1_Release_Notes>`_   |               |             |                                  |
+|                                 |               |             |- Discover process enhance        |
+|                                 |               |             |                                  |
+|                                 |               |             |- xcatprobe `xcatmn` enhance      |
+|                                 |               |             |                                  |
+|                                 |               |             |- xcat-inventory enhance(beta)    |
+|                                 |               |             |                                  |
+|                                 |               |             |- goconserver v0.2.2              |
++---------------------------------+---------------+-------------+----------------------------------+
 || xCAT 2.14                      |- RHEL 7.5     |             |- OpenBMC support in python:      |
 || 2018/4/20                      |               |             |                                  |
 ||                                |               |             |  rspconfig,reventlog             |
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