diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 27d26a6bc39db117316fcd11c0bf4559b6e7556e..cc0e3eace8a3703d303da09e3b394c19fe6ff3e5 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3867,7 +3867,6 @@ struct ast_frame  *zt_read(struct ast_channel *ast)
 		p->subs[index].needanswer = 0;
 		p->subs[index].f.frametype = AST_FRAME_CONTROL;
 		p->subs[index].f.subclass = AST_CONTROL_ANSWER;
-		ast_setstate(ast, AST_STATE_UP);
 		ast_mutex_unlock(&p->lock);
 		return &p->subs[index].f;
 	}	
@@ -4019,7 +4018,6 @@ struct ast_frame  *zt_read(struct ast_channel *ast)
 			   of a DTMF digit */
 			p->subs[index].f.frametype = AST_FRAME_CONTROL;
 			p->subs[index].f.subclass = AST_CONTROL_ANSWER;
-			ast_setstate(ast, AST_STATE_UP);
 			f = &p->subs[index].f;
 		} else if (p->callwaitcas) {
 			if ((f->subclass == 'A') || (f->subclass == 'D')) {
diff --git a/config.c b/config.c
index 41c53b6b6f7e59c87ec697908d981fbd4212cb6c..bc9de3018ab285d209c39a908f248fe675ad2a15 100755
--- a/config.c
+++ b/config.c
@@ -3,9 +3,9 @@
  *
  * Configuration File Parser
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999-2004, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License