diff --git a/Makefile b/Makefile
index 144b292..f3ce6df 100644
--- a/Makefile
+++ b/Makefile
@@ -231,7 +231,7 @@ ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
 	$(INSTALL) -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE)
 endif
 	install -d $(DESTDIR)$(DATA_DIR)
-	install $(ASSIGNED_DATA_SCRIPTS) $(DESTDIR)$(DATA_DIR)/
+	tar cf - -C hotplug $(ASSIGNED_DATA_SCRIPTS) | tar xf - -C $(DESTDIR)$(DATA_DIR)/
 	install $(ASSIGNED_UTILS) $(DESTDIR)/$(BIN_DIR)/
 	install -m 644 $(ASSIGNED_CONF) $(DESTDIR)/$(CONFIG_DIR)/
 
diff --git a/dahdi_handle_device b/hotplug/dahdi_handle_device
similarity index 100%
rename from dahdi_handle_device
rename to hotplug/dahdi_handle_device
diff --git a/dahdi_span_config b/hotplug/dahdi_span_config
similarity index 100%
rename from dahdi_span_config
rename to hotplug/dahdi_span_config