diff --git a/dahdi-tools/.footprint b/dahdi-tools/.footprint
index 08701c283..93498ea93 100644
--- a/dahdi-tools/.footprint
+++ b/dahdi-tools/.footprint
@@ -1,8 +1,10 @@
 drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/dahdi/
+-rw-r--r--	root/root	etc/dahdi/assigned-spans.conf.sample
 -rw-r--r--	root/root	etc/dahdi/genconf_parameters
 -rw-r--r--	root/root	etc/dahdi/init.conf
 -rw-r--r--	root/root	etc/dahdi/modules
+-rw-r--r--	root/root	etc/dahdi/span-types.conf.sample
 -rw-r--r--	root/root	etc/dahdi/system.conf
 drwxr-xr-x	root/root	etc/hotplug/
 drwxr-xr-x	root/root	etc/hotplug/usb/
@@ -11,6 +13,11 @@ lrwxrwxrwx	root/root	etc/hotplug/usb/xpp_fxloader -> /usr/share/dahdi/xpp_fxload
 drwxr-xr-x	root/root	etc/modprobe.d/
 -rw-r--r--	root/root	etc/modprobe.d/dahdi.blacklist.conf
 -rw-r--r--	root/root	etc/modprobe.d/dahdi.conf
+drwxr-xr-x	root/root	lib/
+drwxr-xr-x	root/root	lib/udev/
+drwxr-xr-x	root/root	lib/udev/rules.d/
+-rw-r--r--	root/root	lib/udev/rules.d/dahdi.rules
+-rw-r--r--	root/root	lib/udev/rules.d/xpp.rules
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/dahdi/
@@ -31,9 +38,11 @@ drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.16/Dahdi/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.16/Dahdi/Config/
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.16/Dahdi/Config/Gen.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.16/Dahdi/Config/Gen/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.16/Dahdi/Config/Gen/Assignedspans.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.16/Dahdi/Config/Gen/Chandahdi.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.16/Dahdi/Config/Gen/Freepbxdb.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.16/Dahdi/Config/Gen/Modules.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.16/Dahdi/Config/Gen/Spantypes.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.16/Dahdi/Config/Gen/System.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.16/Dahdi/Config/Gen/Unicall.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.16/Dahdi/Config/Gen/Users.pm
@@ -64,7 +73,10 @@ drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/dahdi_monitor.8.gz
 -rw-r--r--	root/root	usr/man/man8/dahdi_registration.8.gz
 -rw-r--r--	root/root	usr/man/man8/dahdi_scan.8.gz
+-rw-r--r--	root/root	usr/man/man8/dahdi_span_assignments.8.gz
+-rw-r--r--	root/root	usr/man/man8/dahdi_span_types.8.gz
 -rw-r--r--	root/root	usr/man/man8/dahdi_test.8.gz
+-rw-r--r--	root/root	usr/man/man8/dahdi_waitfor_span_assignments.8.gz
 -rw-r--r--	root/root	usr/man/man8/fxotune.8.gz
 -rw-r--r--	root/root	usr/man/man8/lsdahdi.8.gz
 -rw-r--r--	root/root	usr/man/man8/twinstar.8.gz
@@ -82,8 +94,11 @@ drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/dahdi_monitor
 -rwxr-xr-x	root/root	usr/sbin/dahdi_registration
 -rwxr-xr-x	root/root	usr/sbin/dahdi_scan
+-rwxr-xr-x	root/root	usr/sbin/dahdi_span_assignments
+-rwxr-xr-x	root/root	usr/sbin/dahdi_span_types
 -rwxr-xr-x	root/root	usr/sbin/dahdi_speed
 -rwxr-xr-x	root/root	usr/sbin/dahdi_test
+-rwxr-xr-x	root/root	usr/sbin/dahdi_waitfor_span_assignments
 -rwxr-xr-x	root/root	usr/sbin/fxotune
 -rwxr-xr-x	root/root	usr/sbin/lsdahdi
 -rwxr-xr-x	root/root	usr/sbin/sethdlc
@@ -93,5 +108,15 @@ drwxr-xr-x	root/root	usr/sbin/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/dahdi/
 -rwxr-xr-x	root/root	usr/share/dahdi/astribank_hook
+-rwxr-xr-x	root/root	usr/share/dahdi/dahdi_auto_assign_compat
+-rwxr-xr-x	root/root	usr/share/dahdi/dahdi_handle_device
+-rwxr-xr-x	root/root	usr/share/dahdi/dahdi_span_config
+drwxr-xr-x	root/root	usr/share/dahdi/handle_device.d/
+-rwxr-xr-x	root/root	usr/share/dahdi/handle_device.d/10-span-types
+-rwxr-xr-x	root/root	usr/share/dahdi/handle_device.d/20-span-assignments
+drwxr-xr-x	root/root	usr/share/dahdi/span_config.d/
+-rwxr-xr-x	root/root	usr/share/dahdi/span_config.d/10-dahdi-cfg
+-rwxr-xr-x	root/root	usr/share/dahdi/span_config.d/20-fxotune
+-rwxr-xr-x	root/root	usr/share/dahdi/span_config.d/50-asterisk
 -rwxr-xr-x	root/root	usr/share/dahdi/waitfor_xpds
 -rwxr-xr-x	root/root	usr/share/dahdi/xpp_fxloader
diff --git a/dahdi-tools/.md5sum b/dahdi-tools/.md5sum
index 73d009f45..00d09c4ac 100644
--- a/dahdi-tools/.md5sum
+++ b/dahdi-tools/.md5sum
@@ -1 +1 @@
-a0de4eb4e5f556441a3ded8e88d7d321  dahdi-tools-2.7.0.1.tar.gz
+140729230c6d2a73ba88c723d7e3c0d9  dahdi-tools-2.9.1.tar.gz
diff --git a/dahdi-tools/Pkgfile b/dahdi-tools/Pkgfile
index d78055214..3c066a547 100644
--- a/dahdi-tools/Pkgfile
+++ b/dahdi-tools/Pkgfile
@@ -1,11 +1,11 @@
-# Description:	Digium Asterisk Hardware Device Interface Tools
+# Description:	Digium Asterisk Hardware Device Interface Tools: userspace tools
 # URL:		http://www.voip-info.org/wiki/view/DAHDI
 # Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
 # Depends on:	dahdi
 # Optional:	newt
 
 name=dahdi-tools
-version=2.7.0.1
+version=2.9.1
 release=1
 source=(http://downloads.asterisk.org/pub/telephony/$name/releases/$name-$version.tar.gz)
 
@@ -15,6 +15,16 @@ build () {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/man
-	make -j 1
-	make -j 1 config install DESTDIR=$PKG install
+	make
+	make config install DESTDIR=$PKG install
+
+	rm -rf $PKG/etc/bash_completion.d/
+
+	# move udev rules to /lib/udev/rules.d
+	mkdir $PKG/lib
+	mv $PKG/etc/udev $PKG/lib/
+	sed -i \
+		-e 's|%E{DAHDI_TOOLS_ROOTDIR}||g' \
+		-e 's|%E{XPP_INIT_DIR}/|/usr/share/dahdi/|g' \
+		$PKG/lib/udev/rules.d/*
 }