diff --git a/libs/freetdm/src/ftmod/ftmod_analog/ftdm_analog.h b/libs/freetdm/src/ftmod/ftmod_analog/ftdm_analog.h
index 9a4046bf3d..b42d72bcfd 100644
--- a/libs/freetdm/src/ftmod/ftmod_analog/ftdm_analog.h
+++ b/libs/freetdm/src/ftmod/ftmod_analog/ftdm_analog.h
@@ -43,7 +43,7 @@ typedef enum {
 	FTDM_ANALOG_POLARITY_CALLERID = (1 << 4)
 } ftdm_analog_flag_t;
 
-#define FTDM_MAX_HOTLINE_STR		20
+#define FTDM_MAX_HOTLINE_STR		32
 #define MAX_DTMF 256
 
 struct ftdm_analog_data {
diff --git a/libs/freetdm/src/include/freetdm.h b/libs/freetdm/src/include/freetdm.h
index 1aa337b943..2b29d4f396 100755
--- a/libs/freetdm/src/include/freetdm.h
+++ b/libs/freetdm/src/include/freetdm.h
@@ -74,10 +74,10 @@ extern "C" {
 #endif
 
 /*! \brief Limit to span names */
-#define FTDM_MAX_NAME_STR_SZ 80
+#define FTDM_MAX_NAME_STR_SZ 128
 
 /*! \brief Limit to channel number strings */
-#define FTDM_MAX_NUMBER_STR_SZ 20
+#define FTDM_MAX_NUMBER_STR_SZ 32
 
 /*! \brief Hangup cause codes */
 typedef enum {
@@ -343,7 +343,7 @@ typedef enum {
 FTDM_STR2ENUM_P(ftdm_str2ftdm_transfer_response, ftdm_transfer_response2str, ftdm_transfer_response_t)
 
 /*! \brief Digit limit used in DNIS/ANI */
-#define FTDM_DIGITS_LIMIT 25
+#define FTDM_DIGITS_LIMIT 64
 
 #define FTDM_SILENCE_VALUE(fchan) (fchan)->native_codec == FTDM_CODEC_ULAW ? 255 : (fchan)->native_codec == FTDM_CODEC_ALAW ? 0xD5 : 0x00