diff --git a/nhc.conf b/nhc.conf
index fc682324f2310d3e7b4683a919f7089374ae0ae0..af95038d34dfcf5eb96c855b40a7164abb23154b 100644
--- a/nhc.conf
+++ b/nhc.conf
@@ -26,7 +26,9 @@
    {c0[202-255]} || check_hw_cpuinfo 2 128 128
 
 # Set these to the amount of physical RAM you have (leave the fudge factor).
-   {c00[97-99],c0[100-114]} || check_hw_physmem 256gb 256gb 5%
+   {c00[97-99],c0[103-114]} || check_hw_physmem 256gb 256gb 5%
+#### c0101 and c0102 are out of warranty and have lost a DIMM
+   {c0[101-102]} || check_hw_physmem 231gb 231gb 5%
    {c0[115-135]} || check_hw_physmem 192gb 192gb 5%
    {c0[136-139]} || check_hw_physmem 1510gb 1510gb 5%
    {c0[140-201]} || check_hw_physmem 768gb 768gb 5%
@@ -90,11 +92,18 @@
    {c00[97-99],c0[100-255]} || check_fs_mount_rw -f /var
    {c00[97-99],c0[100-255]} || check_fs_free /var 10%
 # /data FS
-   {c00[97-99],c0[100-255]} || check_fs_mount_rw -t gpfs -f /data
+   {c00[97-99],c0[100-201],c0[220-255]} || check_fs_mount_rw -t gpfs -f /data
    {c00[97-99],c0[100-255]} || check_file_test -r -e -f /data/.nhc-test
+# /data FS for GPFS5 nodes
+   {c0[202-219]} || check_fs_mount_rw -t nfs -f /data
 # /scratch FS
-   {c00[97-99],c0[100-255]} || check_fs_mount_rw -t gpfs -f /scratch
+   {c00[97-99],c0[100-201],c0[220-255]} || check_fs_mount_rw -t gpfs -f /scratch
    {c00[97-99],c0[100-255]} || check_file_test -r -e -f /scratch/.nhc-test
+# /scratch FS for GPFS5 nodes
+   {c0[202-219]} || check_fs_mount_rw -t nfs -f /scratch
+# /gpfs FS for GPFS5 clients
+   {c0[202-219]} || check_fs_mount_rw -t gpfs -f /gpfs
+
 # /rstore/share FS
 ##MJH##   * || check_fs_mount -s 192.168.200.19:6789,192.168.200.20:6789,192.168.200.21:6789:/share -t ceph -f /rstore/share
 # /cm/shared