Index: channels/chan_zap.c
===================================================================
--- channels/chan_zap.c	(revision 65376)
+++ channels/chan_zap.c	(working copy)
@@ -10090,14 +10090,27 @@
 							else if (pri->pvts[chanpos]->owner) {
 								/* Queue a BUSY instead of a hangup if our cause is appropriate */
 								pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause;
+                                                                switch (e->hangup.cause) {
+                                                                case PRI_CAUSE_USER_BUSY:
+                                                                        pri->pvts[chanpos]->subs[SUB_REAL].needbusy =1;
+                                                                        break;
+                                                                case PRI_CAUSE_CALL_REJECTED:
+                                                                case PRI_CAUSE_NETWORK_OUT_OF_ORDER:
+                                                                case PRI_CAUSE_NORMAL_CIRCUIT_CONGESTION:
+                                                                case PRI_CAUSE_SWITCH_CONGESTION:
+                                                                case PRI_CAUSE_DESTINATION_OUT_OF_ORDER:
+                                                                case PRI_CAUSE_NORMAL_TEMPORARY_FAILURE:
+                                                                        pri->pvts[chanpos]->subs[SUB_REAL].needcongestion =1;
+                                                                        break;
+                                                                default:
+									break;
+                                                                }
 
 								if (pri->pvts[chanpos]->owner->_state == AST_STATE_UP)
 									pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
-								else if (pri->pvts[chanpos]->owner->hangupcause == PRI_CAUSE_USER_BUSY)
-									pri->pvts[chanpos]->subs[SUB_REAL].needbusy = 1;
-								else
-									pri->pvts[chanpos]->subs[SUB_REAL].needcongestion = 1;
-							}
+								else if (!pri->pvts[chanpos]->subs[SUB_REAL].needbusy && !pri->pvts[chanpos]->subs[SUB_REAL].needcongestion)
+									pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
+                                                        }
 							if (option_verbose > 2) 
 								ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d got hangup, cause %d\n", 
 									pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, e->hangup.cause);
@@ -10146,13 +10159,26 @@
 							pri_hangup_all(pri->pvts[chanpos]->realcall, pri);
 						else if (pri->pvts[chanpos]->owner) {
 							pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause;
+							switch (e->hangup.cause) {
+                                                        case PRI_CAUSE_USER_BUSY:
+                                                        	pri->pvts[chanpos]->subs[SUB_REAL].needbusy =1;
+                                                                break;
+                                                        case PRI_CAUSE_CALL_REJECTED:
+                                                        case PRI_CAUSE_NETWORK_OUT_OF_ORDER:
+                                                        case PRI_CAUSE_NORMAL_CIRCUIT_CONGESTION:
+                                                        case PRI_CAUSE_SWITCH_CONGESTION:
+                                                        case PRI_CAUSE_DESTINATION_OUT_OF_ORDER:
+                                                        case PRI_CAUSE_NORMAL_TEMPORARY_FAILURE:
+                                                        	pri->pvts[chanpos]->subs[SUB_REAL].needcongestion =1;
+                                                                break;
+                                                        default:
+                                                        	break;
+							}
 
-							if (pri->pvts[chanpos]->owner->_state == AST_STATE_UP)
-								pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
-							else if (pri->pvts[chanpos]->owner->hangupcause == PRI_CAUSE_USER_BUSY)
-								pri->pvts[chanpos]->subs[SUB_REAL].needbusy = 1;
-							else
-								pri->pvts[chanpos]->subs[SUB_REAL].needcongestion = 1;
+                                                        if (pri->pvts[chanpos]->owner->_state == AST_STATE_UP)
+                                                        	pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
+                                                        else if (!pri->pvts[chanpos]->subs[SUB_REAL].needbusy && !pri->pvts[chanpos]->subs[SUB_REAL].needcongestion)
+                                                        	pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV;
 
 							if (option_verbose > 2) 
 								ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d got hangup request, cause %d\n", PRI_SPAN(e->hangup.channel), PRI_CHANNEL(e->hangup.channel), pri->span, e->hangup.cause);