diff --git a/CHANGES b/CHANGES
index 56769facdc..42ea9db470 100644
--- a/CHANGES
+++ b/CHANGES
@@ -769,6 +769,7 @@ Call Features (res_features) Changes
      the first one available.
   * Added cli command 'features reload' to reload call features from features.conf
   * Moved into core asterisk binary.
+  * Changed the default setting for featuredigittimeout to 2000 ms from 500 ms.
 
 Language Support Changes
 ------------------------
diff --git a/configs/features.conf.sample b/configs/features.conf.sample
index 90faa12366..9246476143 100644
--- a/configs/features.conf.sample
+++ b/configs/features.conf.sample
@@ -35,8 +35,8 @@ context => parkedcalls		; Which context parked calls are in (default parking lot
 ;xfersound = beep		; to indicate an attended transfer is complete
 ;xferfailsound = beeperr	; to indicate a failed transfer
 ;pickupexten = *8		; Configure the pickup extension. (default is *8)
-;featuredigittimeout = 500	; Max time (ms) between digits for 
-				; feature activation  (default is 500 ms)
+;featuredigittimeout = 2000	; Max time (ms) between digits for 
+				; feature activation  (default is 2000 ms)
 ;atxfernoanswertimeout = 15 ; Timeout for answer on attended transfer default is 15 seconds.
 ;atxferdropcall = no        ; If someone does an attended transfer, then hangs up before the transferred
                             ; caller is connected, then by default, the system will try to call back the
diff --git a/main/features.c b/main/features.c
index ef07b23db7..0d3e2c64ca 100644
--- a/main/features.c
+++ b/main/features.c
@@ -58,7 +58,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #define DEFAULT_PARK_TIME 45000
 #define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3000
-#define DEFAULT_FEATURE_DIGIT_TIMEOUT 500
+#define DEFAULT_FEATURE_DIGIT_TIMEOUT 2000
 #define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER 15000
 #define DEFAULT_PARKINGLOT "default"			/*!< Default parking lot */
 #define DEFAULT_ATXFER_DROP_CALL 0