diff --git a/rigs/yaesu/ft3000.c b/rigs/yaesu/ft3000.c
index 6172bd2ba..32f245504 100644
--- a/rigs/yaesu/ft3000.c
+++ b/rigs/yaesu/ft3000.c
@@ -185,14 +185,13 @@ const struct rig_caps ftdx3000_caps =
         {FTDX5000_CW_RTTY_PKT_RX_MODES,  Hz(1800)},   /* Normal CW, RTTY, PKT/USER */
         {FTDX5000_CW_RTTY_PKT_RX_MODES,  Hz(500)},    /* Narrow CW, RTTY, PKT/USER */
         {FTDX5000_CW_RTTY_PKT_RX_MODES,  Hz(2400)},   /* Wide   CW, RTTY, PKT/USER */
-        {RIG_MODE_SSB,                 Hz(2400)},   /* Normal SSB */
-        {RIG_MODE_SSB,                 Hz(1800)},   /* Narrow SSB */
-        {RIG_MODE_SSB,                 Hz(4000)},   /* Wide   SSB */
-        {RIG_MODE_AM,                  Hz(9000)},   /* Normal AM  */
-        {RIG_MODE_AM,                  Hz(6000)},   /* Narrow AM  */
-        {FTDX5000_FM_WIDE_RX_MODES,    Hz(16000)},  /* Normal FM  */
-        {FTDX5000_FM_WIDE_RX_MODES,    Hz(9000)},   /* Narrow FM  */
-        {RIG_MODE_FMN,                 Hz(9000)},   /* Narrow FM  */
+        {RIG_MODE_SSB,                   Hz(2400)},   /* Normal SSB */
+        {RIG_MODE_SSB,                   Hz(1800)},   /* Narrow SSB */
+        {RIG_MODE_SSB,                   Hz(4000)},   /* Wide   SSB */
+        {FTDX5000_AM_RX_MODES,           Hz(9000)},   /* Normal AM  */
+        {FTDX5000_AM_RX_MODES,           Hz(6000)},   /* Narrow AM  */
+        {FTDX5000_FM_RX_MODES,           Hz(16000)},  /* Normal FM  */
+        {FTDX5000_FM_RX_MODES,           Hz(9000)},   /* Narrow FM  */
         {FTDX5000_CW_RTTY_PKT_RX_MODES | RIG_MODE_SSB, RIG_FLT_ANY},
 
         RIG_FLT_END,
diff --git a/rigs/yaesu/ft5000.c b/rigs/yaesu/ft5000.c
index ca94e384e..cfb13e238 100644
--- a/rigs/yaesu/ft5000.c
+++ b/rigs/yaesu/ft5000.c
@@ -183,11 +183,10 @@ const struct rig_caps ftdx5000_caps =
         {RIG_MODE_SSB,                 Hz(2400)},   /* Normal SSB */
         {RIG_MODE_SSB,                 Hz(1800)},   /* Narrow SSB */
         {RIG_MODE_SSB,                 Hz(4000)},   /* Wide   SSB */
-        {RIG_MODE_AM,                  Hz(9000)},   /* Normal AM  */
-        {RIG_MODE_AM,                  Hz(6000)},   /* Narrow AM  */
-        {FTDX5000_FM_WIDE_RX_MODES,    Hz(16000)},  /* Normal FM  */
-        {FTDX5000_FM_WIDE_RX_MODES,    Hz(9000)},   /* Narrow FM  */
-        {RIG_MODE_FMN,                 Hz(9000)},   /* Narrow FM  */
+        {FTDX5000_AM_RX_MODES,         Hz(9000)},   /* Normal AM  */
+        {FTDX5000_AM_RX_MODES,         Hz(6000)},   /* Narrow AM  */
+        {FTDX5000_FM_RX_MODES,         Hz(16000)},  /* Normal FM  */
+        {FTDX5000_FM_RX_MODES,         Hz(9000)},   /* Narrow FM  */
         {FTDX5000_CW_RTTY_PKT_RX_MODES | RIG_MODE_SSB, RIG_FLT_ANY},
 
         RIG_FLT_END,
diff --git a/rigs/yaesu/ft5000.h b/rigs/yaesu/ft5000.h
index 5dc021b10..7b045376e 100644
--- a/rigs/yaesu/ft5000.h
+++ b/rigs/yaesu/ft5000.h
@@ -32,15 +32,14 @@
 
 /* Receiver caps */
 
-#define FTDX5000_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|\
+#define FTDX5000_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_AMN|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|\
         RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM|\
         RIG_MODE_FM|RIG_MODE_FMN)
 
 #define FTDX5000_SSB_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|\
 		RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB)
-#define FTDX5000_AM_RX_MODES (RIG_MODE_AM)
-#define FTDX5000_FM_WIDE_RX_MODES (RIG_MODE_FM|RIG_MODE_PKTFM)
-#define FTDX5000_FM_RX_MODES (FTDX5000_FM_WIDE_RX_MODES|RIG_MODE_FMN)
+#define FTDX5000_AM_RX_MODES (RIG_MODE_AM|RIG_MODE_AMN)
+#define FTDX5000_FM_RX_MODES (RIG_MODE_FM|RIG_MODE_PKTFM|RIG_MODE_FMN)
 #define FTDX5000_CW_RTTY_PKT_RX_MODES (RIG_MODE_RTTY|RIG_MODE_RTTYR|\
         RIG_MODE_PKTUSB|RIG_MODE_PKTLSB|RIG_MODE_CW|RIG_MODE_CWR)
 
@@ -48,7 +47,7 @@
 
 #define FTDX5000_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_RTTY| \
 		                RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_FM|RIG_MODE_PKTFM|RIG_MODE_FMN) /* 100 W class */
-#define FTDX5000_AM_TX_MODES (RIG_MODE_AM)    /* set 25W max */
+#define FTDX5000_AM_TX_MODES (RIG_MODE_AM|RIG_MODE_AMN)    /* set 25W max */
 
 /* TBC */
 #define FTDX5000_LEVELS (RIG_LEVEL_ATT|RIG_LEVEL_PREAMP|\