diff --git a/TODO b/TODO
index 96d5b6812..1fd8eb261 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+ - trigger --subsystem-match=usb/usb_device
+
  - test (now fixed) /dev/tape/ links
 
  - move udevadm -> --bindir
diff --git a/configure.ac b/configure.ac
index a12c0141f..d155709b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,12 +7,11 @@ AC_INIT([udev],
 AC_CONFIG_SRCDIR([udev/udevd.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([check-news foreign 1.11 -Wall -Wno-portability silent-rules tar-pax dist-bzip2 subdir-objects])
-AC_DISABLE_STATIC
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 AC_CONFIG_MACRO_DIR([m4])
 AM_SILENT_RULES([yes])
-LT_INIT
+LT_INIT([disable-static])
 AC_PROG_AWK
 GTK_DOC_CHECK(1.10)
 AC_PREFIX_DEFAULT([/usr])