diff --git a/rpms/awips2.edex/Installer.edex/ndm/MTR.goodness b/rpms/awips2.edex/Installer.edex/ndm/MTR.goodness
index 6cdfb7adbb..52bac85470 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/MTR.goodness
+++ b/rpms/awips2.edex/Installer.edex/ndm/MTR.goodness
@@ -1952,6 +1952,7 @@
 72205    KMCO  28.41821 -81.32412   32     27983
     0    KMCW  43.15440 -93.32613  370     10744
     0    KMCX  40.7088  -86.76676  206       500
+    0    KMCZ  35.86219 -77.1782    23       500
     0    KMDD  32.0365 -102.1010   854       500
     0    KMDH  37.7900  -89.2500   124      8617
     0    KMDJ  28.6425  -89.7942    -0       500
diff --git a/rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt b/rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt
index 6f1c4a7907..29ffd302d2 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt
+++ b/rpms/awips2.edex/Installer.edex/ndm/afos2awips.txt
@@ -11203,6 +11203,7 @@ JANTAFGPT FTUS44 KLIX
 JANTAFGTR FTUS44 KJAN
 JANTAFGWO FTUS44 KJAN
 JANTAFHBG FTUS44 KJAN
+JANTAFHEZ FTUS44 KJAN
 JANTAFHKS FTUS44 KJAN
 JANTAFJAN FTUS44 KJAN
 JANTAFMCB FTUS44 KLIX
@@ -13329,6 +13330,7 @@ MEMTAFJBR FTUS44 KMEG
 MEMTAFMEM FTUS44 KMEG
 MEMTAFMKL FTUS44 KMEG
 MEMTAFMQY FTUS44 KOHX
+MEMTAFSRB FTUS44 KOHX
 MEMTAFTRI FTUS44 KMRX
 MEMTAFTUP FTUS44 KMEG
 MEMTAFTYS FTUS44 KMRX
@@ -15643,7 +15645,6 @@ MKERTPWI ASUS63 KMKX
 MKERVAARX SRUS43 KARX
 MKERVAGRB SRUS43 KGRB
 MKERVAMKX SRUS43 KMKX
-MKERVDARX FGUS53 KARX
 MKERVDGRB FGUS53 KGRB
 MKERVDMKX FGUS53 KMKX
 MKERVMARX SRUS43 KARX
@@ -24601,6 +24602,7 @@ SEADSMBFI CXUS46 KSEW
 SEADSMEAT CXUS46 KOTX
 SEADSMGEG CXUS46 KOTX
 SEADSMNRA CXUS46 KSEW
+SEADSMNUW CXUS46 KSEW
 SEADSMOLM CXUS46 KSEW
 SEADSMPDT CXUS46 KPDT
 SEADSMSEA CXUS46 KSEW
@@ -24694,6 +24696,7 @@ SEAMSMBFI CSUS46 KSEW
 SEAMSMEAT CSUS46 KOTX
 SEAMSMGEG CSUS46 KOTX
 SEAMSMNRA CSUS46 KSEW
+SEAMSMNUW CSUS46 KSEW
 SEAMSMSEA CSUS46 KSEW
 SEAMSMUIL CSUS46 KSEW
 SEAMSMYKM CSUS46 KPDT
@@ -24776,10 +24779,12 @@ SEARR5OTX SRUS56 KOTX
 SEARR5SEW SRUS56 KSEW
 SEARR5YKM SRUS56 KPDT
 SEARR6NRA SRUS66 KSEW
+SEARR6NUW SRUS66 KSEW
 SEARR6OTX SRUS66 KOTX
 SEARR6SEW SRUS66 KSEW
 SEARR6YKM SRUS66 KPDT
 SEARR7NRA SRUS76 KSEW
+SEARR7NUW SRUS76 KSEW
 SEARR7OTX SRUS76 KOTX
 SEARR7SEW SRUS76 KSEW
 SEARR7SHN SRUS76 KSEW
@@ -24794,7 +24799,9 @@ SEARRAOTX SRUS86 KOTX
 SEARRASEW SRUS86 KSEW
 SEARRMOTX SRUS46 KOTX
 SEARRMSEW SRUS46 KSEW
+SEARRXNUW SRUS66 KSEW
 SEARRXYKM SRUS66 KPDT
+SEARRYNUW SRUS76 KSEW
 SEARTPOTX ASUS66 KOTX
 SEARTPSEW ASUS66 KSEW
 SEARTPWA ASUS66 KSEW
@@ -28650,6 +28657,7 @@ WBCSWRDC ASUS41 KWBC
 WBCSWRDE ASUS51 KWBC
 WBCSWRMD ASUS61 KWBC
 WBCSWRVA ASUS71 KWBC
+WBCTAFBCB FTUS41 KRNK
 WBCTAFBLF FTUS41 KRNK
 WBCTAFBWI FTUS41 KLWX
 WBCTAFCHO FTUS41 KLWX
diff --git a/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt b/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt
index 6ebab24bbf..79128b8f3f 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt
+++ b/rpms/awips2.edex/Installer.edex/ndm/afosMasterPIL.txt
@@ -12326,6 +12326,7 @@ JANTAFGPT
 JANTAFGTR
 JANTAFGWO
 JANTAFHBG
+JANTAFHEZ
 JANTAFHKS
 JANTAFJAN
 JANTAFMCB
@@ -19666,6 +19667,7 @@ MEMTAFJBR
 MEMTAFMEM
 MEMTAFMKL
 MEMTAFMQY
+MEMTAFSRB
 MEMTAFTRI
 MEMTAFTUP
 MEMTAFTYS
@@ -25159,7 +25161,6 @@ MKERTPWI
 MKERVAARX
 MKERVAGRB
 MKERVAMKX
-MKERVDARX
 MKERVDGRB
 MKERVDMKX
 MKERVMARX
@@ -38137,6 +38138,7 @@ RDUMTRIXA
 RDUMTRLBT
 RDUMTRLHZ
 RDUMTRMAO
+RDUMTRMCZ
 RDUMTRMEB
 RDUMTRMQI
 RDUMTRMRH
diff --git a/rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt b/rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt
index 4c4dd35b0f..4da78b888b 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt
+++ b/rpms/awips2.edex/Installer.edex/ndm/metarStationInfo.txt
@@ -2631,6 +2631,7 @@
 0000072205|KMCO | 28.41821|-81.32412| 32|ORLANDO JETPORT, FL                |US|MTR
 0000000000|KMCW | 43.15440|-93.32613| 370|MASON CITY, IA                    |US|MTR
 0000000000|KMCX | 40.7088| -86.76676|206|White Cnty AP, Monticello, IN      |US|MTR
+0000000000|KMCZ | 35.86219| -77.1782|23|Martin Cnty Airport, Williamston, NC|US|MTR
 0000000000|KMDD | 32.037|-102.101|  854|Midland Airpark, Midland, TX        |US|MTR
 0000000000|KMDH | 37.79 | -89.25 |  124|SOUTH CARBONDALE, IL                |US|MTR
 0000000000|KMDJ | 28.643| -89.794|   -0|GOMEX Mississippi Canyon, LA AWOS-3 |US|MTR
diff --git a/rpms/awips2.edex/Installer.edex/ndm/national_category_table.template b/rpms/awips2.edex/Installer.edex/ndm/national_category_table.template
index 9cc2c53ada..bc40acf5fc 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/national_category_table.template
+++ b/rpms/awips2.edex/Installer.edex/ndm/national_category_table.template
@@ -2591,6 +2591,7 @@ KMCN  ATL
 KMCO  MIA
 KMCW  DSM
 KMCX  IND
+KMCZ  RDU
 KMDD  LBB
 KMDH  CHI
 KMDJ  NEW
diff --git a/rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt b/rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt
index 2433d4e413..fcb5a5cf25 100644
--- a/rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt
+++ b/rpms/awips2.edex/Installer.edex/ndm/textCCChelp.txt
@@ -2846,6 +2846,7 @@ MCU Chihuahua Intl, MX
 MCV Cuidad Victoria Arpt, MX
 MCW Mason City, IA
 MCX White Cnty AP, Monticello, IN
+MCZ Martin County Airport, Williamston, NC
 MCZ Cozumel, MX
 MD1 Rivers in Maryland
 MDC Marias Des Cygnes