diff --git a/configure.ac b/configure.ac
index b9a1ed53..f72c298a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,11 +86,13 @@ enable_all_plugins=auto
 AC_PLUGIN([alsa-utils],    [no],  [Save and restore ALSA sound settings using alsactl])
 AC_PLUGIN([dbus],          [no],  [Setup and start system message bus, D-Bus])
 AC_PLUGIN([modules-load],  [no],  [Scans /etc/modules-load.d for modules to load])
+AC_PLUGIN([modprobe],      [yes], [Coldplug modules using modalias magic])
 AC_PLUGIN([resolvconf],    [no],  [Setup necessary files for resolvconf])
 AC_PLUGIN([x11-common],    [no],  [Console setup (for X)])
 AC_PLUGIN([netlink],       [yes], [Basic netlink plugin for IFUP/IFDN and GW events. Can be replaced with externally built plugin that links with libnl or similar.])
 AC_PLUGIN([hotplug],       [yes], [Setup and start udev or mdev hotplug daemon])
 AC_PLUGIN([rtc],           [yes], [Save and restore RTC using hwclock])
+AC_PLUGIN([tty],           [yes], [Automatically activate new TTYs, e.g. USB-to-serial])
 AC_PLUGIN([urandom],       [yes], [Setup and save random seed at boot/shutdown])
 
 # Check for extra arguments or packages
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 4f2c719e..4360cd55 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS        += $(lite_CFLAGS) $(uev_CFLAGS)
 
 if STATIC
 noinst_LTLIBRARIES  = libplug.la
-libplug_la_SOURCES  = bootmisc.c modprobe.c pidfile.c procps.c sys.c tty.c usr.c
+libplug_la_SOURCES  = bootmisc.c pidfile.c procps.c sys.c usr.c
 
 if BUILD_ALSA_UTILS_PLUGIN
 libplug_la_SOURCES += alsa-utils.c
@@ -25,6 +25,10 @@ if BUILD_MODULES_LOAD_PLUGIN
 libplug_la_SOURCES += modules-load.c
 endif
 
+if BUILD_MODPROBE_PLUGIN
+libplug_la_SOURCES += modprobe.c
+endif
+
 if BUILD_NETLINK_PLUGIN
 libplug_la_SOURCES += netlink.c
 endif
@@ -37,6 +41,10 @@ if BUILD_RTC_PLUGIN
 libplug_la_SOURCES += rtc.c
 endif
 
+if BUILD_TTY_PLUGIN
+libplug_la_SOURCES += tty.c
+endif
+
 if BUILD_URANDOM_PLUGIN
 libplug_la_SOURCES += urandom.c
 endif
@@ -46,7 +54,7 @@ libplug_la_SOURCES += x11-common.c
 endif
 
 else
-pkglib_LTLIBRARIES  = bootmisc.la modprobe.la pidfile.la procps.la sys.la tty.la usr.la
+pkglib_LTLIBRARIES  = bootmisc.la pidfile.la procps.la sys.la usr.la
 
 if BUILD_ALSA_UTILS_PLUGIN
 pkglib_LTLIBRARIES += alsa-utils.la
@@ -64,6 +72,10 @@ if BUILD_MODULES_LOAD_PLUGIN
 pkglib_LTLIBRARIES += modules-load.la
 endif
 
+if BUILD_MODPROBE_PLUGIN
+pkglib_LTLIBRARIES += modprobe.la
+endif
+
 if BUILD_NETLINK_PLUGIN
 pkglib_LTLIBRARIES += netlink.la
 endif
@@ -76,6 +88,10 @@ if BUILD_RTC_PLUGIN
 pkglib_LTLIBRARIES += rtc.la
 endif
 
+if BUILD_TTY_PLUGIN
+pkglib_LTLIBRARIES += tty.la
+endif
+
 if BUILD_URANDOM_PLUGIN
 pkglib_LTLIBRARIES += urandom.la
 endif