diff --git a/CHANGES b/CHANGES
index d0cd4b3e33868ae2f62ceedb64f87725200ec9c0..d9059c84b1dcdf9c8340251227ee3a82ca381360 100644
--- a/CHANGES
+++ b/CHANGES
@@ -366,6 +366,9 @@ Other Dialplan Application Changes
   * AMD() has a new "maximum word length" option. "show application AMD" from the CLI
      for more details
   * GotoIfTime() now may branch based on a "false" condition, like other Goto-related applications
+  * The ChannelRedirect application no longer exits the dialplan if the given channel
+     does not exist. It will now set the CHANNELREDIRECT_STATUS variable to SUCCESS upon success
+     or NOCHANNEL if the given channel was not found.
 
 Music On Hold Changes
 ---------------------
diff --git a/UPGRADE.txt b/UPGRADE.txt
index d1832d52fe0f26209a5be8d3e7eedc5a65dc2e99..46ab23db98f993779a90db6783dd6ec3acae4c7b 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -77,6 +77,9 @@ Applications:
 * ChanIsAvail() now has a 't' option, which allows the specified device
   to be queried for state without consulting the channel drivers. This
   performs mostly a 'ChanExists' sort of function.
+* ChannelRedirect() will not terminate the channel that fails to do a
+  channelredirect as it has done previously. Instead CHANNELREDIRECT_STATUS
+  will reflect if the attempt was successful of not.
 * SetCallerPres() has been replaced with the CALLERPRES() dialplan function
   and is now deprecated.
 * DISA()'s fifth argument is now an options argument.  If you have previously
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index 462942724336145a42ed3bcec4be62e047207ab6..ed7f2e43e54f6a6d1173fd44dd59d346b276124d 100644
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.c
@@ -39,8 +39,10 @@ static char *app = "ChannelRedirect";
 static char *synopsis = "Redirects given channel to a dialplan target.";
 static char *descrip =
 "ChannelRedirect(channel,[[context,]extension,]priority)\n"
-"  Sends the specified channel to the specified extension priority\n";
-
+"  Sends the specified channel to the specified extension priority\n"
+"This application sets the following channel variables upon completion:\n"
+"  CHANNELREDIRECT_STATUS - Are set to the result of the redirection\n"
+"                           either NOCHANNEL or SUCCESS\n";
 
 static int asyncgoto_exec(struct ast_channel *chan, void *data)
 {
@@ -69,11 +71,12 @@ static int asyncgoto_exec(struct ast_channel *chan, void *data)
 	chan2 = ast_get_channel_by_name_locked(args.channel);
 	if (!chan2) {
 		ast_log(LOG_WARNING, "No such channel: %s\n", args.channel);
-		return -1;
+		pbx_builtin_setvar_helper(chan, "CHANNELREDIRECT_STATUS", "NOCHANNEL");
+		return 0;
 	}
 
 	res = ast_async_parseable_goto(chan2, args.label);
-
+	pbx_builtin_setvar_helper(chan, "CHANNELREDIRECT_STATUS", "SUCCESS");
 	ast_channel_unlock(chan2);
 
 	return res;