diff -Nru dahdi-tools-2.6.0/dahdi_cfg.c dahdi-cnet-tools-2.6.0/dahdi_cfg.c
--- dahdi-tools-2.6.0/dahdi_cfg.c	2011-11-02 16:57:25.000000000 -0500
+++ dahdi-cnet-tools-2.6.0/dahdi_cfg.c	2012-01-05 18:23:52.000000000 -0600
@@ -703,6 +703,118 @@
 	return 0;
 }
 
+/* (CNET) Handle the "ignoreflash" keyword to tell an
+   FXO to ignore a remote flash command */
+static int setflash(char *keyword, char *args)
+{
+	int res;
+	short setting;
+	int x;
+	int chans[DAHDI_MAX_CHANNELS];
+
+	bzero(chans, sizeof(chans));
+	res = apply_channels(chans, args);
+	if (res <= 0)
+		return -1;
+	if (!strcasecmp(keyword, "ignoreflash")) {
+		setting = 1;
+	} else {
+		fprintf(stderr, "Huh??? Don't know about '%s' flash setting\n", keyword);
+		return -1;
+	}
+	for (x=0;x<DAHDI_MAX_CHANNELS;x++) {
+		if (chans[x])
+			cc[x].ignoreflash = setting;
+	}
+	return 0;
+}
+
+/* (CNET) Handle the "pulse_nz_oslo" keyword to tell an
+   FXS to use Oslo/NZ-style pulse dial mapping */
+static int setnz_oslo(char *keyword, char *args)
+{
+	int res;
+	short setting;
+	int x;
+	int chans[DAHDI_MAX_CHANNELS];
+
+	bzero(chans, sizeof(chans));
+	res = apply_channels(chans, args);
+	if (res <= 0)
+		return -1;
+	if (!strcasecmp(keyword, "pulse_nz_oslo")) {
+		setting = MAP_PULSE_NZ_OSLO;
+	} else {
+		fprintf(stderr, "Huh??? Don't know about '%s' pulse_nz_oslo setting\n", keyword);
+		return -1;
+	}
+	for (x=0;x<DAHDI_MAX_CHANNELS;x++) {
+		if (chans[x]) {
+			if(cc[x].map_pulse)
+				fprintf(stderr, "WARNING: Ignoring %s due to previous pulse mapping\n", keyword);
+			else
+				cc[x].map_pulse = setting;
+		}
+	}
+	return 0;
+}
+
+/* (CNET) Handle the "pulse_sweden" keyword to tell an
+   FXS to use Swedish-style pulse dial mapping */
+static int setsweden(char *keyword, char *args)
+{
+	int res;
+	short setting;
+	int x;
+	int chans[DAHDI_MAX_CHANNELS];
+
+	bzero(chans, sizeof(chans));
+	res = apply_channels(chans, args);
+	if (res <= 0)
+		return -1;
+	if (!strcasecmp(keyword, "pulse_sweden")) {
+		setting = MAP_PULSE_SWEDEN;
+	} else {
+		fprintf(stderr, "Huh??? Don't know about '%s' pulse_sweden setting\n", keyword);
+		return -1;
+	}
+	for (x=0;x<DAHDI_MAX_CHANNELS;x++) {
+		if (chans[x]) {
+			if(cc[x].map_pulse)
+				fprintf(stderr, "WARNING: Ignoring %s due to previous pulse mapping\n", keyword);
+			else
+				cc[x].map_pulse = setting;
+		}
+	}
+	return 0;
+}
+
+/* (CNET) Handle the "hearpulsing" keyword to make
+   outpulsing audible to the caller */
+static int sethearpulsing(char *keyword, char *args)
+{
+	int res;
+	short setting;
+	int x;
+	int chans[DAHDI_MAX_CHANNELS];
+
+	bzero(chans, sizeof(chans));
+	res = apply_channels(chans, args);
+	if (res <= 0)
+		return -1;
+	if (!strcasecmp(keyword, "hearpulsing")) {
+		setting = 1;
+	} else {
+		fprintf(stderr, "Huh??? Don't know about '%s' hearpulsing setting\n", keyword);
+		return -1;
+	}
+	for (x=0;x<DAHDI_MAX_CHANNELS;x++) {
+		if (chans[x])
+			cc[x].hearpulsing = setting;
+	}
+	return 0;
+}
+
 static int setfiftysixkhdlc(char *keyword, char *args)
 {
 	int res;
@@ -1374,6 +1486,10 @@
 	{ "channels", rad_chanconfig },
 	{ "echocanceller", setechocan },
 	{ "56k", setfiftysixkhdlc },
+	{ "ignoreflash", setflash }, /* (CNET) Make FXOs ignore flash */
+	{ "pulse_nz_oslo", setnz_oslo }, /* (CNET) Use Oslo/NZ pulse dial mapping */
+	{ "pulse_sweden", setsweden }, /* (CNET) Use Swedish pulse mapping */
+	{ "hearpulsing", sethearpulsing }, /* (CNET) Make outpulsing audible to caller */
 };
 
 static char *readline()
diff -Nru dahdi-tools-2.6.0/dahdi.init dahdi-cnet-tools-2.6.0/dahdi.init
--- dahdi-tools-2.6.0/dahdi.init	2011-03-16 09:23:09.000000000 -0500
+++ dahdi-cnet-tools-2.6.0/dahdi.init	2012-01-05 18:23:52.000000000 -0600
@@ -2,7 +2,7 @@
 #
 # dahdi         This shell script takes care of loading and unloading \
 #               DAHDI Telephony interfaces
-# chkconfig: 2345 9 92
+# chkconfig: 2345 27 92
 # description: The DAHDI drivers allow you to use your linux \
 # computer to accept incoming data and voice interfaces
 #
diff -Nru dahdi-tools-2.6.0/Makefile dahdi-cnet-tools-2.6.0/Makefile
--- dahdi-tools-2.6.0/Makefile	2011-11-01 13:10:14.000000000 -0500
+++ dahdi-cnet-tools-2.6.0/Makefile	2012-01-05 18:23:52.000000000 -0600
@@ -87,6 +87,9 @@
 endif
 endif
 
+# Mark as a CNET version
+TOOLSVERSION:=${TOOLSVERSION}-cnet
+
 LTZ_A:=libtonezone.a
 LTZ_A_OBJS:=zonedata.o tonezone.o version.o
 LTZ_SO:=libtonezone.so
diff -Nru dahdi-tools-2.6.0/READMEFIRST.cnet dahdi-cnet-tools-2.6.0/READMEFIRST.cnet
--- dahdi-tools-2.6.0/READMEFIRST.cnet	1969-12-31 18:00:00.000000000 -0600
+++ dahdi-cnet-tools-2.6.0/READMEFIRST.cnet	2012-01-05 18:24:10.000000000 -0600
@@ -0,0 +1,180 @@
+dahdi-cnet: DAHDI with adaptations for antique telephony, especially
+intended for use with C*NET, the Telephone Collector's Network.
+
+This driver is intended as a companion to asterisk-cnet, a modified
+version of Asterisk.  It MAY be used with standard Asterisk, but
+asterisk-cnet MUST be used with dahdi-cnet.
+
+DISCLAIMER: This is NOT an official Digium package!  Do not expect
+any support from Digium if you use this!
+
+Modifications done by Russ Price <cnet@octothorpe.info>, with audible
+pulsing code and dial speed test support by Max Parke.
+
+Latest changes:
+2012-01-05: Updated to 2.6.0 release.
+2011-10-29: Updated to 2.5.0.2 release.
+2011-09-19: Updated to 2.5.0.1 release.
+2011-08-10: Updated to 2.5.0 release.
+            See <http://octothorpe.info/site/dialspeed> for
+            dial speed AGI applications. Max's old code needed
+            some changes for the /proc interface, and a new
+            AGI written by me in PHP is also available.
+2011-05-29: Added Max's dial speed tester support. You will still
+            need his AGI application to implement a dial speed
+            test.  <http://www.lightlink.com/mhp/dialtest/>
+            Updated tools to 2.4.1 and drivers to 2.4.1.2.
+2010-10-13: Updated to 2.4.0 release.
+            Note that there is now a dialdebounce module parameter
+            for the wctdm module.  This version defaults to 32
+            (corresponding to what was done in earlier dahdi-cnet
+            versions) rather than 64 as in the stock driver.
+2010-05-05: Updated to 2.3.0 release.
+2010-01-20: Updated to 2.2.1 release version.
+2010-01-09: Updated to 2.2.1-rc2; 2.2.0.2 won't build on recent systems
+            such as Ubuntu 9.10 (Karmic).
+2009-12-12: Added DKMS support.
+2009-11-29: Changed drivers/dahdi/Kbuild to make sure OSLEC gets built on
+            CentOS systems.
+2009-07-24: Updated drivers to 2.2.0.2.
+2009-07-02: 2.2.0 First DAHDI-cnet release.
+
+This is a modified version of Digium's DAHDI device drivers for
+telephony interfaces; especially, the wctdm driver for the TDM400P
+analog telephone interface card. It provides the following features:
+
+    * DKMS kernel module build support.
+    * OSLEC echo canceller is INCLUDED in this package and will be
+      automatically built and installed
+    * the ability to force the TDM400P FXS ports to provide ring current
+      at a specific frequency, intended for US phones with frequency-
+      selective party line ringers
+    * improved pulse dialing on TDM400P FXS ports
+    * four additional call progress tone sets, usable on any FXS port
+    * an ignoreflash keyword that may be used in your
+      /etc/dahdi/system.conf file to cause FXO ports to ignore a remote
+      hookflash
+    * dial pulse mappings for New Zealand (or Oslo, Norway), and Sweden
+    * FXO pulse dial pause fix - "W" in dial strings will pause even if
+      the FXO is set for pulse dialing
+    * audible pulsing option; requires the CNET-modified Asterisk in
+      addition to the modified DAHDI
+
+Quick Install:
+
+      cd /usr/src/dahdi-cnet-linux-2.4.1.2
+
+      make
+
+      make install
+
+      cd /usr/src/dahdi-cnet-tools-2.4.1
+
+      ./configure
+
+      make
+
+      make install
+
+Quick Install using DKMS:
+
+	dkms add -m dahdi-cnet-linux -v 2.4.1.2 -k `uname -r`
+	dkms install -m dahdi-cnet-linux -v 2.4.1.2 -k `uname -r`
+	cd /usr/src/dahdi-cnet-tools-2.4.1
+	make
+	make install
+
+Making use of the features in /etc/dahdi/system.conf:
+
+    * Ignore hookflash: If your TDM400P has FXO ports on channels 1 and
+      2, and FXS ports on 3 and 4, you could tell the FXOs to ignore a
+      remote hookflash as follows:
+
+        fxsks=1-2
+        ignoreflash=1-2
+        fxoks=3-4
+        # use my PBX tones instead of standard tones on the FXS ports
+        loadzone=xp
+        defaultzone=xp
+
+    * Dial pulse mapping: If you have rotary-dial phones with NZ/Oslo or
+      Swedish dial arrangements, you can set FXS channels like so:
+
+        pulse_nz_oslo=8
+        pulse_sweden=17-18
+
+      Note that dial pulse mapping will work on T1/E1 channels as well
+      as on TDM400P cards. The ignoreflash keyword will also work.
+
+UPDATE 2-27-07: Dial pulse mapping now works for FXO ports as well as
+FXS. Use the same syntax above.
+
+(3-31-07) WARNING: Pulse dialing on T1 channel bank FXO ports may or may
+not work for you! I've noticed that the pulses from an FXO on an Adtran
+750 channel bank are rather irregular-sounding, and also sound like they
+have an improper break/make ratio. If you need to pulse dial into a step
+switch, I suggest using either a TDM400P or X100P card!
+
+(6-28-09) AMENDED. I don't know if this is a DAHDI vs. Zaptel issue,
+or if the fact that I'm running DAHDI on a much faster CPU, but my pulse
+dial problems with the channel bank are GONE.
+
+    * Pause fix for FXO pulse dialing: Just use a "w" in the dial
+      string, just like you would for DTMF.
+
+    * Audible pulsing: If you want callers to hear your Asterisk box
+      pulsing into your step switch, you will need to use the modified
+      Asterisk as well as the modified DAHDI. You will then need to
+      activate audible pulsing on the channels where you want it in both
+      /etc/dahdi/system.conf and /etc/asterisk/chan_dahdi.conf
+      for this to work.
+
+        /etc/dahdi/system.conf:
+
+          hearpulsing=2-3
+
+        /etc/asterisk/chan_dahdi.conf:
+
+          ; be sure to apply other settings to these channels
+          hearpulsing=yes
+          channel => 2
+          channel => 3
+
+    * FXS port ring frequency: set when loading the wctdm module. The
+      command line passed to modprobe would take the form:
+
+        modprobe wctdm opermode=FCC30 fxshonormode=1 boostringer=1
+
+      Modes available are:
+
+          * FCC17 (16.67 Hz)
+          * FCC25 (25 Hz)
+          * FCC30 (30 Hz)
+          * FCC33 (33.33 Hz)
+          * FCC40 (40 Hz)
+          * FCC42 (42 Hz)
+          * FCC50 (50 Hz)
+          * FCC54 (54 Hz)
+          * FCC60 (60 Hz)
+          * FCC67 (66.66 Hz)
+
+      The standard FCC mode is 20 Hz.
+
+      NOTE: Changing the opermode parameter affects all FXS ports on the
+      card.  This may change in a future release.
+
+    * Extra call progress tone zones: these require changes in
+      /etc/asterisk/chan_dahdi.conf and /etc/dahdi/system.conf.
+
+        /etc/dahdi/system.conf:
+
+          loadzone=xm   # Re-creation of the 1960 Bell Labs experimental
+                        # ESS in Morris, Illinois
+          loadzone=xp	# North America (PBX tones)
+          loadzone=xu   # Old-style UK tones (purring dial tone, etc.)
+	  loadzone=x1	# Standard US tones with distinctive second
+			# dial tone
+
+        /etc/asterisk/chan_dahdi.conf
+
+          # Use tonezone=100 for xm, 101 for xp, 102 for xu, 103 for x1
diff -Nru dahdi-tools-2.6.0/tonezone.c dahdi-cnet-tools-2.6.0/tonezone.c
--- dahdi-tools-2.6.0/tonezone.c	2009-09-15 12:51:15.000000000 -0500
+++ dahdi-cnet-tools-2.6.0/tonezone.c	2012-01-05 18:23:52.000000000 -0600
@@ -201,6 +201,8 @@
 		return "Special Information";
 	case DAHDI_TONE_STUTTER:
 		return "Stutter Dialtone";
+	case DAHDI_TONE_SECONDDIALTONE:	/* (CNET) */
+		return "Secondary Dialtone";
 	default:
 		snprintf(tmp, sizeof(tmp), "Unknown tone %d", id);
 		return tmp;
diff -Nru dahdi-tools-2.6.0/zonedata.c dahdi-cnet-tools-2.6.0/zonedata.c
--- dahdi-tools-2.6.0/zonedata.c	2011-05-24 10:14:32.000000000 -0500
+++ dahdi-cnet-tools-2.6.0/zonedata.c	2012-01-05 18:23:52.000000000 -0600
@@ -48,6 +48,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
 			{ DAHDI_TONE_STUTTER, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
+			{ DAHDI_TONE_SECONDDIALTONE, "350+440" },
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
@@ -69,6 +70,7 @@
 			{ DAHDI_TONE_RECORDTONE, "!425/1000,!0/15000,425/360,0/15000" },
 			{ DAHDI_TONE_INFO, "425/2500,0/500" },
 			{ DAHDI_TONE_STUTTER, "413+438/100,0/40" },
+			{ DAHDI_TONE_SECONDDIALTONE, "413+438" },
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
@@ -94,6 +96,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
 			{ DAHDI_TONE_STUTTER, "!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,!440/100,!0/100,440" },
+			{ DAHDI_TONE_SECONDDIALTONE, "440" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -118,6 +121,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
 			{ DAHDI_TONE_STUTTER, "425/500,0/50" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -139,6 +143,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/60000" },
 			{ DAHDI_TONE_INFO, "950/330,0/15,1400/330,0/15,1800/330,0/1000" },
 			{ DAHDI_TONE_STUTTER, "350+440/750,440/750" },
+			{ DAHDI_TONE_SECONDDIALTONE, "350+440" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -159,6 +164,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO, "950/650,0/325,950/325,0/30,1400/1300,0/2600" },
 			{ DAHDI_TONE_STUTTER, "425/650,0/25" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -179,6 +185,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO, "950/330,0/1000" },
 			{ DAHDI_TONE_STUTTER, "425/500,0/50" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -199,6 +206,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
 			{ DAHDI_TONE_STUTTER, "!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,400" },
+			{ DAHDI_TONE_SECONDDIALTONE, "400" },
 		},
 	  .dtmf_high_level = -7,
 	  .dtmf_low_level = -7,
@@ -219,6 +227,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/400,0/15000" },
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0" },
 			{ DAHDI_TONE_STUTTER, "470/400,425/400" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
@@ -241,6 +250,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/80,0/14920" },
 			{ DAHDI_TONE_INFO, "950/330,1450/330,1850/330,0/1000" },
 			{ DAHDI_TONE_STUTTER, "380+420" },
+			{ DAHDI_TONE_SECONDDIALTONE, "420" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -261,6 +271,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/425,0/15000" },
 			{ DAHDI_TONE_INFO, "400/750,0/100,400/750,0/100,400/750,0/100,400/750,0/400" },
 			{ DAHDI_TONE_STUTTER, "!400/100!0/100,!400/100,!0/100,!400/100,!0/100,!400/100!0/100,!400/100,!0/100,!400/100,!0/100,400" },
+			{ DAHDI_TONE_SECONDDIALTONE, "400" },
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
@@ -282,6 +293,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/400,0/15000" },
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0" },
 			{ DAHDI_TONE_STUTTER, "470/400,425/400" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425/200,0/200,425/600,0/1000" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -302,6 +314,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
 			{ DAHDI_TONE_STUTTER, "!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,!600*120/100,!0/100,600*120" },
+			{ DAHDI_TONE_SECONDDIALTONE, "600*120" },
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
@@ -322,6 +335,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/400,0/15000" },
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0" },
 			{ DAHDI_TONE_STUTTER, "425/650,0/25" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425/200,0/300,425/700,0/800" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -342,6 +356,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
 			{ DAHDI_TONE_STUTTER, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
+			{ DAHDI_TONE_SECONDDIALTONE, "350+440" },
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
@@ -362,6 +377,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO, "!950/333,!1400/333,!1800/333,0" },
 			{ DAHDI_TONE_STUTTER, "!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,400" },
+			{ DAHDI_TONE_SECONDDIALTONE, "400" },
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
@@ -387,6 +403,7 @@
 			  "!950/332,!0/24,!1400/332,!0/24,!1800/332,0" },
 			/*{ DAHDI_TONE_STUTTER, "425/320,0/20" },              Real swedish standard, not used for now */
 			{ DAHDI_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -410,6 +427,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO, "900/330,1400/330,1800/330,0/1000" },
 			{ DAHDI_TONE_STUTTER, "425/1000,0/250" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -433,6 +451,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO,       "950/330,1400/330,1800/330,0/1000" },
 			{ DAHDI_TONE_STUTTER,    "!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,425" },
+			{ DAHDI_TONE_SECONDDIALTONE,   "425" },
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
@@ -453,6 +472,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO, "1000/330,1400/330,1800/330,0/1000" },
 			{ DAHDI_TONE_STUTTER, "!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,414" },
+			{ DAHDI_TONE_SECONDDIALTONE, "414" },
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
@@ -472,7 +492,9 @@
 			{ DAHDI_TONE_DIALRECALL, "350+440" },
 			{ DAHDI_TONE_RECORDTONE, "425/250,0/250" },
 			{ DAHDI_TONE_INFO, "950/330,1400/330,1800/330" },
-			{ DAHDI_TONE_STUTTER, "350+440" } },
+			{ DAHDI_TONE_STUTTER, "350+440" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
+		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -12,
 	  .mfr1_level = -10,
@@ -494,6 +516,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/400,0/15000" },
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0" },
 			{ DAHDI_TONE_STUTTER, "350+375+400" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -518,6 +541,7 @@
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0" },
 			/* STUTTER not specified */
 			{ DAHDI_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -542,6 +566,7 @@
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,0" },
 			/* STUTTER not specified */
 			{ DAHDI_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -565,6 +590,7 @@
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0" },
 			/* STUTTER not specified */
 			{ DAHDI_TONE_STUTTER, "!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,400*33" },
+			{ DAHDI_TONE_SECONDDIALTONE, "400*33" },
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -13,
@@ -588,6 +614,7 @@
 			{ DAHDI_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
 			/* STUTTER not specified */
 			{ DAHDI_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -612,6 +639,7 @@
 			{ DAHDI_TONE_INFO, "950/0,0/325,950/325,0/30,1400/1300,0/2600" },
 			/* STUTTER not specified */
 			{ DAHDI_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -632,6 +660,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
 			{ DAHDI_TONE_INFO, "950/330,0/30,1400/330,0/30,1800/330,0/1000" },
 			{ DAHDI_TONE_STUTTER, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -8,
 	  .dtmf_low_level = -6,
@@ -657,6 +686,7 @@
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,0/1000" },
 			/* STUTTER - not specified */
 			{ DAHDI_TONE_STUTTER, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
+			{ DAHDI_TONE_SECONDDIALTONE, "400*25" },
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
@@ -680,6 +710,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/80,0/15000" },
 			{ DAHDI_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
 			{ DAHDI_TONE_STUTTER, "425+400" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -703,6 +734,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/80,0/15000" },
 			{ DAHDI_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
 			{ DAHDI_TONE_STUTTER, "425+340/1100,0/1100" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
@@ -727,6 +759,7 @@
 			{ DAHDI_TONE_INFO, "950/330,1400/330,1800/330,0/1000" },
 			/* STUTTER - not specified */
 			{ DAHDI_TONE_STUTTER, "425/450,0/50" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -751,6 +784,7 @@
 			{ DAHDI_TONE_INFO, "950/330,0/30,1400/330,0/30,1800/330,0/1000" },
 			/* STUTTER - not specified */
 			{ DAHDI_TONE_STUTTER, "425/450,0/50" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425/330,0/330,425/660,0/660" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -773,6 +807,7 @@
 			{ DAHDI_TONE_INFO, "450/100,0/100,450/100,0/100,450/100,0/100,450/400,0/400" },
 			/* STUTTER - not specified */
 			{ DAHDI_TONE_STUTTER, "450+425" },
+			{ DAHDI_TONE_SECONDDIALTONE, "450" },
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
@@ -793,6 +828,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/14000" },
 			{ DAHDI_TONE_INFO, "425/100,0/100" },
 			{ DAHDI_TONE_STUTTER, "425/450,0/50" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
@@ -813,6 +849,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/60000" },
 			{ DAHDI_TONE_INFO, "950/330,0/15,1400/330,0/15,1800/330,0/1000" },
 			{ DAHDI_TONE_STUTTER, "450+425" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
@@ -838,6 +875,7 @@
 			{ DAHDI_TONE_INFO,       "950/330,1400/330,1800/330" },
 			/* STUTTER - not specified */
 			{ DAHDI_TONE_STUTTER,    "!400/200,!0/200,!400/600,!0/200,!400/200,!0/200,!400/600,!0/200,!400/200,!0/200,!400/600,!0/200,!400/200,!0/200,!400/600,!0/200,400" },
+			{ DAHDI_TONE_SECONDDIALTONE,   "400*50" },
 		},
 	  .dtmf_high_level = -11,
 	  .dtmf_low_level = -9,
@@ -859,6 +897,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/425,0/15000" },
 			{ DAHDI_TONE_INFO,       "950/330,1400/330,1800/330,0/1000" },
 			{ DAHDI_TONE_STUTTER,    "425/1500,0/100" },
+			{ DAHDI_TONE_SECONDDIALTONE,   "425" },
 		},
 	  .dtmf_high_level = -9,
 	  .dtmf_low_level = -11,
@@ -881,6 +920,7 @@
 			{ DAHDI_TONE_INFO, "!950/330,!1440/330,!1800/330,0/1000" },
 			/* STUTTER - not specified */
 			{ DAHDI_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -7,
 	  .dtmf_low_level = -9,
@@ -906,6 +946,7 @@
 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
 			/* STUTTER TONE - not specified */
 			{ DAHDI_TONE_STUTTER, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
@@ -928,6 +969,7 @@
 			{ DAHDI_TONE_RECORDTONE, "1400/400,0/15000" },
 			{ DAHDI_TONE_INFO, "950/330,1440/330,1800/330,0/1000" },
 			{ DAHDI_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
+			{ DAHDI_TONE_SECONDDIALTONE, "425" },
 		},
 	  .dtmf_high_level = -10,
 	  .dtmf_low_level = -10,
@@ -1050,5 +1092,92 @@
 		.mfr1_level = -10,
 		.mfr2_level = -8,
 	},
+ 	{
+ 		.zone = 100,
+ 		.country = "xm",
+ 		.description = "Morris, IL experimental ESS (ca. 1960)",
+ 		.ringcadence = { 2000, 2000 },
+ 		.tones = {
+ 			{ DAHDI_TONE_DIALTONE, "560+690" },
+ 			{ DAHDI_TONE_BUSY, "560+690/500,0/500" },
+ 			{ DAHDI_TONE_RINGTONE, "430+454/2000,0/2000" },
+ 			{ DAHDI_TONE_CONGESTION, "560+690/300,0/200" },
+ 			{ DAHDI_TONE_CALLWAIT, "591/300,0/10000" },
+ 			{ DAHDI_TONE_DIALRECALL, "!560+690/100,!0/100,!560+690/100,!0/100,!560+690/100,!0/100,560+690" },
+ 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
+ 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
+ 			{ DAHDI_TONE_STUTTER, "!560+690/100,!0/100,!560+690/100,!0/100,!560+690/100,!0/100,!560+690/100,!0/100,!560+690/100,!0/100,!560+690/100,!0/100,560+690" },
+ 			{ DAHDI_TONE_SECONDDIALTONE, "350+440" },
+ 		},
+ 	  .dtmf_high_level = -10,
+ 	  .dtmf_low_level = -10,
+ 	  .mfr1_level = -10,
+ 	  .mfr2_level = -8,
+ 	},
+ 	{
+ 		.zone = 101,
+ 		.country = "xp",
+ 		.description = "North America (PBX)",
+ 		.ringcadence = { 2000, 4000 },
+ 		.tones = {
+ 			{ DAHDI_TONE_DIALTONE, "500+640" },
+ 			{ DAHDI_TONE_BUSY, "480+620/500,0/500" },
+ 			{ DAHDI_TONE_RINGTONE, "440+480/2000,0/4000" },
+ 			{ DAHDI_TONE_CONGESTION, "480+620/250,0/250" },
+ 			{ DAHDI_TONE_CALLWAIT, "440/300,0/10000" },
+ 			{ DAHDI_TONE_DIALRECALL, "!500+640/100,!0/100,!500+640/100,!0/100,!500+640/100,!0/100,500+640" },
+ 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
+ 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
+ 			{ DAHDI_TONE_STUTTER, "!500+640/100,!0/100,!500+640/100,!0/100,!500+640/100,!0/100,!500+640/100,!0/100,!500+640/100,!0/100,!500+640/100,!0/100,500+640" },
+ 			{ DAHDI_TONE_SECONDDIALTONE, "350+440" },
+ 		},
+ 	  .dtmf_high_level = -10,
+ 	  .dtmf_low_level = -10,
+ 	  .mfr1_level = -10,
+ 	  .mfr2_level = -8,
+ 	},
+ 	{
+ 		.zone = 102,
+ 		.country = "xu",
+ 		.description = "United Kingdom (old-style tones)",
+ 		.ringcadence = { 400, 200, 400, 2000 },
+ 		.tones = {
+ 			{ DAHDI_TONE_DIALTONE, "33/16,0/16" },
+ 			{ DAHDI_TONE_BUSY, "400/375,0/375" },
+ 			{ DAHDI_TONE_RINGTONE, "388+413/400,0/200,388+413/400,0/2000" },
+ 			{ DAHDI_TONE_CONGESTION, "400/400,0/350,400/225,0/525" },
+ 			{ DAHDI_TONE_CALLWAIT, "400/100,0/4000" },
+ 			{ DAHDI_TONE_DIALRECALL, "!400/100,!0/100,!400/100,!0/100,!400/100,0/100,33/16,0/16" },
+ 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
+ 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
+ 			{ DAHDI_TONE_STUTTER, "!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,!400/100,!0/100,33/16,0/16" },
+ 			{ DAHDI_TONE_SECONDDIALTONE, "350+440" },
+ 		},
+ 	  .dtmf_high_level = -9,
+ 	  .dtmf_low_level = -11,
+ 	  .mfr1_level = -7,
+ 	  .mfr2_level = -8,
+ 	},
+ 	{ .zone = 103,
+ 	  .country = "x1",
+ 	  .description = "US / N. America with secondary dialtone",
+ 	  .ringcadence = { 2000, 4000 },
+ 	  .tones = {
+ 			{ DAHDI_TONE_DIALTONE, "350+440" },
+ 			{ DAHDI_TONE_BUSY, "480+620/500,0/500" },
+ 			{ DAHDI_TONE_RINGTONE, "440+480/2000,0/4000" },
+ 			{ DAHDI_TONE_CONGESTION, "480+620/250,0/250" },
+ 			{ DAHDI_TONE_CALLWAIT, "440/300,0/10000" },
+ 			{ DAHDI_TONE_DIALRECALL, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
+ 			{ DAHDI_TONE_RECORDTONE, "1400/500,0/15000" },
+ 			{ DAHDI_TONE_INFO, "!950/330,!1400/330,!1800/330,0" },
+ 			{ DAHDI_TONE_STUTTER, "!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440" },
+ 			{ DAHDI_TONE_SECONDDIALTONE, "500+640" },
+ 		},
+ 	  .dtmf_high_level = -10,
+ 	  .dtmf_low_level = -10,
+ 	  .mfr1_level = -10,
+ 	  .mfr2_level = -8,
+ 	},
 	{ .zone = -1 }
 };