--- pbx.orig	2005-09-14 09:52:09.000000000 -0400
+++ pbx.c	2005-09-14 10:45:42.000000000 -0400
@@ -312,9 +312,11 @@
 
 	{ "GotoIfTime", pbx_builtin_gotoiftime,
 	"Conditional goto on current time",
-	"  GotoIfTime(<times>|<weekdays>|<mdays>|<months>?[[context|]extension|]pri):\n"
-	"If the current time matches the specified time, then branch to the specified\n"
-	"extension. Each of the elements may be specified either as '*' (for always)\n"
+	"  GotoIfTime(<times>|<weekdays>|<mdays>|<months>?[label1][:label2]\n"
+	"If the current time matches the specified time, then branch to label1.\n"
+	"If the current time does not match, branch to label2.\n"
+	"label1 or label2 can be ommited\n"
+	"Each of the elements may be specified either as '*' (for always)\n"
 	"or as a range. See the 'include' syntax for details." 
 	},
 
@@ -5293,23 +5295,35 @@
 static int pbx_builtin_gotoiftime(struct ast_channel *chan, void *data)
 {
 	int res=0;
-	char *s, *ts;
+	char *s, *ts, *fs;
 	struct ast_timing timing;
 
 	if (!data || ast_strlen_zero(data)) {
-		ast_log(LOG_WARNING, "GotoIfTime requires an argument:\n  <time range>|<days of week>|<days of month>|<months>?[[context|]extension|]priority\n");
+		ast_log(LOG_WARNING, "GotoIfTime requires an argument:\n  <time range>|<days of week>|<days of month>|<months>?[[context1|]extension1|]priority1[:[[context2|]extension2|]priority2]\n");
 		return -1;
 	}
 
 	if ((s = ast_strdupa((char *) data))) {
 		ts = s;
 
-		/* Separate the Goto path */
+		/* Separate the condition from the gotos */
 		strsep(&ts,"?");
 
+		fs = ts;
+		/* Separate the true and false goto path */
+		strsep(&fs, ":");
+
 		/* struct ast_include include contained garbage here, fixed by zeroing it on get_timerange */
-		if (ast_build_timing(&timing, s) && ast_check_timing(&timing))
-			res = pbx_builtin_goto(chan, (void *)ts);
+		if (ast_build_timing(&timing, s) && ast_check_timing(&timing)) {
+			if (!((ts==NULL) ||(ast_strlen_zero(ts)))) {
+				res = pbx_builtin_goto(chan, (void *)ts);
+			}
+		}
+		else {
+			if (!((fs==NULL) || ast_strlen_zero(fs))) {
+                                res = pbx_builtin_goto(chan, (void *)fs);
+			}
+		}
 	} else {
 		ast_log(LOG_ERROR, "Memory Error!\n");
 	}