diff -u zaptel-1.4.11~dfsg/debian/changelog zaptel-1.4.11~dfsg/debian/changelog
--- zaptel-1.4.11~dfsg/debian/changelog
+++ zaptel-1.4.11~dfsg/debian/changelog
@@ -1,3 +1,12 @@
+zaptel (1:1.4.11~dfsg-3ubuntu2) karmic; urgency=low
+
+  * debian/patches/udev_fix: fixes from DAHDI: r5179 (LP: #64059)
+    - Add '!' as a directory separator to Zaptel device names. This
+      makes udev generate files under zap/ on his own.
+    - Fixes a off-by-one error (unexploitable).
+
+ -- Stefan Lesicnik <stefan@lsd.co.za>  Tue, 23 Jun 2009 19:55:33 +0200
+
 zaptel (1:1.4.11~dfsg-3ubuntu1) jaunty; urgency=low
 
   * debian/patches/ubuntu_udev_rulesdir: Install udev rules into
diff -u zaptel-1.4.11~dfsg/debian/patches/series zaptel-1.4.11~dfsg/debian/patches/series
--- zaptel-1.4.11~dfsg/debian/patches/series
+++ zaptel-1.4.11~dfsg/debian/patches/series
@@ -19,0 +20 @@
+udev_fix
only in patch2:
unchanged:
--- zaptel-1.4.11~dfsg.orig/debian/patches/udev_fix
+++ zaptel-1.4.11~dfsg/debian/patches/udev_fix
@@ -0,0 +1,40 @@
+Index: zaptel-1.4.11~dfsg/kernel/zaptel-base.c
+===================================================================
+--- zaptel-1.4.11~dfsg.orig/kernel/zaptel-base.c	2009-06-23 19:49:23.021783095 +0200
++++ zaptel-1.4.11~dfsg/kernel/zaptel-base.c	2009-06-23 19:49:33.517800604 +0200
+@@ -5299,7 +5299,7 @@
+ 	for (x = 0; x < span->channels; x++) {
+ 		char chan_name[50];
+ 		if (span->chans[x].channo < 250) {
+-			sprintf(chan_name, "zap%d", span->chans[x].channo);
++			sprintf(chan_name, "zap!%d", span->chans[x].channo);
+ 			CLASS_DEV_CREATE(zap_class, MKDEV(ZT_MAJOR, span->chans[x].channo), NULL, chan_name);
+ 		}
+ 	}
+@@ -7826,9 +7826,9 @@
+ #endif /* CONFIG_DEVFS_FS */
+ 
+ #ifdef CONFIG_ZAP_UDEV
+-	char udevname[strlen(dev->name) + 3];
++	char udevname[strlen(dev->name) + sizeof("zap!")];
+ 
+-	strcpy(udevname, "zap");
++	strcpy(udevname, "zap!");
+ 	strcat(udevname, dev->name);
+ 	CLASS_DEV_CREATE(zap_class, MKDEV(ZT_MAJOR, dev->minor), NULL, udevname);
+ #endif /* CONFIG_ZAP_UDEV */
+@@ -7862,10 +7862,10 @@
+ 
+ #ifdef CONFIG_ZAP_UDEV /* udev support functions */
+ 	zap_class = class_create(THIS_MODULE, "zaptel");
+-	CLASS_DEV_CREATE(zap_class, MKDEV(ZT_MAJOR, 253), NULL, "zaptimer");
+-	CLASS_DEV_CREATE(zap_class, MKDEV(ZT_MAJOR, 254), NULL, "zapchannel");
+-	CLASS_DEV_CREATE(zap_class, MKDEV(ZT_MAJOR, 255), NULL, "zappseudo");
+-	CLASS_DEV_CREATE(zap_class, MKDEV(ZT_MAJOR, 0), NULL, "zapctl");
++	CLASS_DEV_CREATE(zap_class, MKDEV(ZT_MAJOR, 253), NULL, "zap!timer");
++	CLASS_DEV_CREATE(zap_class, MKDEV(ZT_MAJOR, 254), NULL, "zap!channel");
++	CLASS_DEV_CREATE(zap_class, MKDEV(ZT_MAJOR, 255), NULL, "zap!pseudo");
++	CLASS_DEV_CREATE(zap_class, MKDEV(ZT_MAJOR, 0), NULL, "zap!ctl");
+ #endif /* CONFIG_ZAP_UDEV */
+ 
+ #ifdef CONFIG_DEVFS_FS