diff -urN ast-oej-jb.2006.03.01/channels/chan_sip.c ast-oej-jb.2006.03.01.fixed/channels/chan_sip.c
--- ast-oej-jb.2006.03.01/channels/chan_sip.c	2006-03-01 16:07:52.000000000 +0200
+++ ast-oej-jb.2006.03.01.fixed/channels/chan_sip.c	2006-03-01 17:14:30.000000000 +0200
@@ -12180,14 +12180,6 @@
 	for (; v; v = v->next) {
 		if (handle_common_options(&peerflags, &mask, v))
 			continue;
-#ifdef AST_JB
-		/* handle jb conf */
-		if(ast_jb_read_conf(&global_jbconf, v->name, v->value) == 0)
-		{
-			v = v->next;
-			continue;
-		}
-#endif /* AST_JB */
 
 		if (realtime && !strcasecmp(v->name, "regseconds")) {
 			ast_get_time_t(v->value, &regseconds, 0, NULL);
@@ -12460,6 +12452,13 @@
 	for (v = ast_variable_browse(cfg, "general"); v; v = v->next) {
 		if (handle_common_options(&global_flags, &dummy, v))
 			continue;
+#ifdef AST_JB
+		/* handle jb conf */
+		if(ast_jb_read_conf(&global_jbconf, v->name, v->value) == 0)
+		{
+			continue;
+		}
+#endif /* AST_JB */
 
 		/* Create the interface list */
 		if (!strcasecmp(v->name, "context")) {
diff -urN ast-oej-jb.2006.03.01/channels/chan_zap.c ast-oej-jb.2006.03.01.fixed/channels/chan_zap.c
--- ast-oej-jb.2006.03.01/channels/chan_zap.c	2006-03-01 16:07:52.000000000 +0200
+++ ast-oej-jb.2006.03.01.fixed/channels/chan_zap.c	2006-03-01 18:00:03.000000000 +0200
@@ -120,7 +120,6 @@
 static struct ast_jb_conf global_jbconf;
 #endif /* AST_JB */
 
-#ifndef ZT_SIG_EM_E1
 #ifndef ZT_SIG_HARDHDLC
 #error "Your zaptel is too old.  please update"
 #endif
diff -urN ast-oej-jb.2006.03.01/.lastclean ast-oej-jb.2006.03.01.fixed/.lastclean
--- ast-oej-jb.2006.03.01/.lastclean	1970-01-01 02:00:00.000000000 +0200
+++ ast-oej-jb.2006.03.01.fixed/.lastclean	2006-03-01 17:31:57.000000000 +0200
@@ -0,0 +1 @@
+11