diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 027ae16..37d4c63 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-SUBDIRS =		\
+DIST_SUBDIRS = \
 	common		\
 	a11y-keyboard	\
 	background	\
@@ -19,3 +19,28 @@ SUBDIRS =		\
 	xrdb		\
 	xsettings	\
 	$(NULL)
+
+SUBDIRS =		\
+	common		\
+	a11y-keyboard	\
+	background	\
+	clipboard	\
+	dummy		\
+	font		\
+	housekeeping    \
+	keybindings	\
+	keyboard	\
+	media-keys	\
+	mouse		\
+	sound		\
+	typing-break	\
+	xrandr		\
+	xrdb		\
+	xsettings	\
+	$(NULL)
+
+if SMARTCARD_SUPPORT
+SUBDIRS +=		\
+	smartcard	\
+	$(NULL)
+endif
diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am
index 62e253e..dcfaf49 100644
--- a/plugins/smartcard/Makefile.am
+++ b/plugins/smartcard/Makefile.am
@@ -1,4 +1,3 @@
-if SMARTCARD_SUPPORT
 plugin_LTLIBRARIES = \
 	libsmartcard.la
 
@@ -32,7 +31,6 @@ libsmartcard_la_LIBADD = \
 	$(NSS_LIBS)
 
 @GSD_INTLTOOL_PLUGIN_RULE@
-endif
 
 plugin_in_files = \
 	smartcard.gnome-settings-plugin.in
