diff --git a/YSFControl.cpp b/YSFControl.cpp
index 09fb9b2..d41ff2d 100644
--- a/YSFControl.cpp
+++ b/YSFControl.cpp
@@ -219,7 +219,7 @@ bool CYSFControl::processVWData(bool valid, unsigned char *data)
 			}
 
 			unsigned char cm = m_lastFICH.getCM();
-			if (cm == YSF_CM_GROUP)
+			if (cm == YSF_CM_GROUP1 || cm == YSF_CM_GROUP2)
 				m_rfDest = (unsigned char*)"ALL       ";
 			else
 				m_rfDest = m_rfPayload.getDest();
@@ -402,7 +402,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 			}
 
 			unsigned char cm = m_lastFICH.getCM();
-			if (cm == YSF_CM_GROUP)
+			if (cm == YSF_CM_GROUP1 || cm == YSF_CM_GROUP2)
 				m_rfDest = (unsigned char*)"ALL       ";
 			else
 				m_rfDest = m_rfPayload.getDest();
@@ -601,7 +601,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 				return false;
 
 			unsigned char cm = m_lastFICH.getCM();
-			if (cm == YSF_CM_GROUP)
+			if (cm == YSF_CM_GROUP1 || cm == YSF_CM_GROUP2)
 				m_rfDest = (unsigned char*)"ALL       ";
 			else
 				m_rfDest = m_rfPayload.getDest();
@@ -649,7 +649,7 @@ bool CYSFControl::processDNData(bool valid, unsigned char *data)
 			memcpy(csd1 + YSF_CALLSIGN_LENGTH, m_rfSource, YSF_CALLSIGN_LENGTH);
 			memset(csd2, ' ', YSF_CALLSIGN_LENGTH + YSF_CALLSIGN_LENGTH);
 
-			if (cm == YSF_CM_GROUP)
+			if (cm == YSF_CM_GROUP1 || cm == YSF_CM_GROUP2)
 				memset(csd1 + 0U, '*', YSF_CALLSIGN_LENGTH);
 			else
 				memcpy(csd1 + 0U, m_rfDest, YSF_CALLSIGN_LENGTH);
@@ -741,7 +741,7 @@ bool CYSFControl::processFRData(bool valid, unsigned char *data)
 			}
 
 			unsigned char cm = m_lastFICH.getCM();
-			if (cm == YSF_CM_GROUP)
+			if (cm == YSF_CM_GROUP1 || cm == YSF_CM_GROUP2)
 				m_rfDest = (unsigned char*)"ALL       ";
 			else
 				m_rfDest = m_rfPayload.getDest();
diff --git a/YSFDefines.h b/YSFDefines.h
index 28ec7c1..0b974c3 100644
--- a/YSFDefines.h
+++ b/YSFDefines.h
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -42,7 +42,8 @@ const unsigned char YSF_DT_DATA_FR_MODE  = 0x01U;
 const unsigned char YSF_DT_VD_MODE2      = 0x02U;
 const unsigned char YSF_DT_VOICE_FR_MODE = 0x03U;
 
-const unsigned char YSF_CM_GROUP      = 0x00U;
+const unsigned char YSF_CM_GROUP1     = 0x00U;
+const unsigned char YSF_CM_GROUP2     = 0x01U;
 const unsigned char YSF_CM_INDIVIDUAL = 0x03U;
 
 const unsigned char YSF_MR_NOT_BUSY = 0x01U;