--- hald/freebsd/Makefile.in.orig	2009-05-17 00:43:12.000000000 -0400
+++ hald/freebsd/Makefile.in	2009-05-17 00:43:12.000000000 -0400
@@ -32,6 +32,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@HAVE_LIBUSB20_TRUE@am__append_1 = \
+@HAVE_LIBUSB20_TRUE@	hf-usb2.c		\
+@HAVE_LIBUSB20_TRUE@	hf-usb2.h
+
+@HAVE_LIBUSB20_TRUE@am__append_2 = @LIBUSB20_LIBS@
 subdir = hald/freebsd
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -44,11 +49,20 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libhald_freebsd_la_LIBADD =
+am__libhald_freebsd_la_SOURCES_DIST = hf-acpi.c hf-acpi.h hf-ata.c \
+	hf-ata.h hf-block.c hf-block.h hf-computer.c hf-computer.h \
+	hf-devd.c hf-devd.h hf-devtree.c hf-devtree.h hf-drm.c \
+	hf-drm.h hf-net.c hf-net.h hf-osspec.h hf-pci.c hf-pci.h \
+	hf-pcmcia.c hf-pcmcia.h hf-scsi.c hf-scsi.h hf-serial.c \
+	hf-serial.h hf-sound.c hf-sound.h hf-storage.c hf-storage.h \
+	hf-usb.c hf-usb.h hf-util.c hf-util.h hf-volume.c hf-volume.h \
+	osspec.c hal-file-monitor.c hf-usb2.c hf-usb2.h
+@HAVE_LIBUSB20_TRUE@am__objects_1 = hf-usb2.lo
 am_libhald_freebsd_la_OBJECTS = hf-acpi.lo hf-ata.lo hf-block.lo \
 	hf-computer.lo hf-devd.lo hf-devtree.lo hf-drm.lo hf-net.lo \
 	hf-pci.lo hf-pcmcia.lo hf-scsi.lo hf-serial.lo hf-sound.lo \
 	hf-storage.lo hf-usb.lo hf-util.lo hf-volume.lo osspec.lo \
-	hal-file-monitor.lo
+	hal-file-monitor.lo $(am__objects_1)
 libhald_freebsd_la_OBJECTS = $(am_libhald_freebsd_la_OBJECTS)
 libhald_freebsd_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -67,7 +81,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libhald_freebsd_la_SOURCES)
-DIST_SOURCES = $(libhald_freebsd_la_SOURCES)
+DIST_SOURCES = $(am__libhald_freebsd_la_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -250,46 +264,15 @@ AM_CPPFLAGS = \
 	@GLIB_CFLAGS@ @DBUS_CFLAGS@ @POLKIT_CFLAGS@
 
 @HALD_COMPILE_FREEBSD_TRUE@noinst_LTLIBRARIES = libhald_freebsd.la
-libhald_freebsd_la_SOURCES = \
-	hf-acpi.c		\
-	hf-acpi.h		\
-	hf-ata.c		\
-	hf-ata.h		\
-	hf-block.c		\
-	hf-block.h		\
-	hf-computer.c		\
-	hf-computer.h		\
-	hf-devd.c		\
-	hf-devd.h		\
-	hf-devtree.c		\
-	hf-devtree.h		\
-	hf-drm.c		\
-	hf-drm.h		\
-	hf-net.c		\
-	hf-net.h		\
-	hf-osspec.h		\
-	hf-pci.c		\
-	hf-pci.h		\
-	hf-pcmcia.c		\
-	hf-pcmcia.h		\
-	hf-scsi.c		\
-	hf-scsi.h		\
-	hf-serial.c		\
-	hf-serial.h		\
-	hf-sound.c		\
-	hf-sound.h		\
-	hf-storage.c		\
-	hf-storage.h		\
-	hf-usb.c		\
-	hf-usb.h		\
-	hf-util.c		\
-	hf-util.h		\
-	hf-volume.c		\
-	hf-volume.h		\
-	osspec.c		\
-	hal-file-monitor.c
-
-libhald_freebsd_la_LDFLAGS = -lcam
+libhald_freebsd_la_SOURCES = hf-acpi.c hf-acpi.h hf-ata.c hf-ata.h \
+	hf-block.c hf-block.h hf-computer.c hf-computer.h hf-devd.c \
+	hf-devd.h hf-devtree.c hf-devtree.h hf-drm.c hf-drm.h hf-net.c \
+	hf-net.h hf-osspec.h hf-pci.c hf-pci.h hf-pcmcia.c hf-pcmcia.h \
+	hf-scsi.c hf-scsi.h hf-serial.c hf-serial.h hf-sound.c \
+	hf-sound.h hf-storage.c hf-storage.h hf-usb.c hf-usb.h \
+	hf-util.c hf-util.h hf-volume.c hf-volume.h osspec.c \
+	hal-file-monitor.c $(am__append_1)
+libhald_freebsd_la_LDFLAGS = -lcam $(am__append_2)
 EXTRA_DIST = README TODO
 all: all-recursive
 
@@ -358,6 +341,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-sound.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-storage.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-usb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-usb2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-volume.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osspec.Plo@am__quote@