diff --git a/ChangeLog b/ChangeLog
index 2825f3d1d..75be605c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,10 @@
 	  UMAX 3400. 
 	* tools/hotplug/libsane.usermap: Removed. Will be created 
 	  automatically by sane-desc.
+	* tools/Makefile.in: Create libsane.usermap (for hotplug),
+	  libsane.db (for hotplug-ng) and libsane.rules (for udev)
+	  automatically with sane-desc based on the :usbid tokens in the
+	  description files.
 
 2006-04-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 88eed0528..9a27abd51 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -53,7 +53,8 @@ DISTCLEAN_FILES = @DISTCLEAN_FILES@
 
 @SET_MAKE@
 
-DESTINATIONS = sane-find-scanner sane-config umax_pp gamma4scanimage sane-desc
+DESTINATIONS = sane-find-scanner sane-config umax_pp gamma4scanimage sane-desc \
+	       hotplug/libsane.usermap hotplug-ng/libsane.db udev/libsane.rules
 
 EXTRA = sane_strstatus.lo ../sanei/sanei_init_debug.lo \
 	../sanei/sanei_config.lo ../sanei/sanei_config2.lo \
@@ -69,7 +70,7 @@ DISTFILES = Makefile.in RenSaneDlls.cmd README libtool-get-dll-ext     \
 
 SUBDIRS = hotplug hotplug-ng udev
 
-.PHONY: all clean depend dist distclean install uninstall
+.PHONY: all clean depend dist distclean install uninstall 
 
 .c.o:
 	$(COMPILE) $<
@@ -110,6 +111,19 @@ umax_pp: umax_pp.o ../backend/umax_pp_low.o
 sane-desc: sane-desc.o
 	@$(LIBTOOL) $(MLINK) $(LINK) sane-desc.o $(LIBSANEI) $(LIBLIB)
 
+hotplug/libsane.usermap: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
+	@./sane-desc -m usermap -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
+	   -d 1 > $@
+
+hotplug-ng/libsane.db: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
+	@./sane-desc -m db -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
+	   -d 0 > $@
+
+udev/libsane.rules: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
+	@./sane-desc -m udev -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
+	   -d 0 > $@
+
+
 depend:
 	makedepend $(INCLUDES) *.c 2>/dev/null
 
@@ -117,6 +131,7 @@ clean:
 	rm -f *.lo *.o *.la
 	find . -type l -name \*-s.c | xargs rm -f
 	rm -rf .libs
+	rm -f hotplug/libsane.usermap hotplug-ng/libsane.db hotplug/libsane.rules
 
 distclean: clean
 	rm -f Makefile $(DESTINATIONS) mustek600iin-off sane-desc