diff --git a/Makefile b/Makefile
index 322aff2..62f430a 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,7 @@ BIN_DIR:=$(sbindir)
 LIB_DIR:=$(libdir)
 INC_DIR:=$(includedir)/dahdi
 MAN_DIR:=$(mandir)/man8
+DATA_DIR:=${datadir}/dahdi
 CONFIG_DIR:=$(sysconfdir)/dahdi
 CONFIG_FILE:=$(CONFIG_DIR)/system.conf
 
@@ -109,6 +110,11 @@ ifeq	(1,$(PBX_HDLC))
 endif
 MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8))
 
+PINNED_DATA_SCRIPTS:=dahdi_cfg_device_args handle_device \
+	span_assignments span_types
+PINNED_UTILS:=dahdi_map
+PINNED_CONF:=pinned-spans.conf spantype.conf
+
 TEST_BINS:=patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest dahdi_maint
 # All the man pages. Not just installed ones:
 GROFF_PAGES	:= $(wildcard doc/*.8 xpp/*.8)
@@ -227,6 +233,12 @@ ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
 	$(INSTALL) -d $(DESTDIR)$(CONFIG_DIR)
 	$(INSTALL) -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE)
 endif
+ifeq ($(DAHDI_PINNED),yes)
+	install -d $(DESTDIR)$(DATA_DIR)
+	install $(PINNED_DATA_SCRIPTS) $(DESTDIR)$(DATA_DIR)/
+	install $(PINNED_UTILS) $(DESTDIR)/$(BIN_DIR)/
+	install -m 644 $(PINNED_CONF) $(DESTDIR)/$(CONFIG_DIR)/
+endif
 
 install-libs: libs
 	$(INSTALL) -d -m 755 $(DESTDIR)/$(LIB_DIR)
diff --git a/configure.ac b/configure.ac
index 4fa396b..d970365 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,15 @@ AC_ARG_ENABLE(dev-mode,
 	esac])
 AC_SUBST(DAHDI_DEVMODE)
 
+AC_ARG_ENABLE(pinned,
+	[  --enable-pinned    Install pinned-spans support],
+	[case "${enableval}" in
+	      y|ye|yes) DAHDI_PINNED=yes ;;
+	      n|no)  DAHDI_PINNED=no ;;
+	      *) AC_MSG_ERROR(bad value ${enableval} for --enable-pinned)  ;;
+	esac])
+AC_SUBST(DAHDI_PINNED)
+
 AC_MSG_CHECKING(for -Wdeclaration-after-statement support)
 if $(${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
 	AC_MSG_RESULT(yes)
diff --git a/makeopts.in b/makeopts.in
index a892a76..ebda941 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -30,6 +30,8 @@ DOWNLOAD=@DOWNLOAD@
 DAHDI_DEVMODE=@DAHDI_DEVMODE@
 DAHDI_DECLARATION_AFTER_STATEMENT=@DAHDI_DECLARATION_AFTER_STATEMENT@
 
+DAHDI_PINNED=@DAHDI_PINNED@
+
 PBX_NEWT=@PBX_NEWT@
 NEWT_LIB=@NEWT_LIB@
 NEWT_INCLUDE=@NEWT_INCLUDE@