diff --git a/Makefile.am b/Makefile.am
index 4c6a46132..0de2ff4d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,15 +4,16 @@ endif
 
 if ORBIT_INSTALLED
 control_center = control-center
+capplets = capplets
 endif
 
 always_built_SUBDIRS = panel applets \
 	 gsm smproxy pixmaps desktop-links desktop-properties help-browser \
-	 gnome-terminal core-docs
+	 gnome-terminal core-docs 
 
-sometimes_built_SUBDIRS = gmenu control-center
+sometimes_built_SUBDIRS = gmenu control-center capplets
 
-SUBDIRS = intl po macros $(always_built_SUBDIRS) $(gmenu) $(control_center)
+SUBDIRS = intl po macros $(always_built_SUBDIRS) $(gmenu) $(control_center)  $(capplets)
 
 #DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) \
 #	$(sometimes_built_SUBDIRS)
diff --git a/capplets/Makefile.am b/capplets/Makefile.am
new file mode 100644
index 000000000..bbe470f55
--- /dev/null
+++ b/capplets/Makefile.am
@@ -0,0 +1,6 @@
+always_built_SUBDIRS = mouse-properties background-properties desktop-links
+
+SUBDIRS = $(always_built_SUBDIRS)
+
+
+DIST_SUBDIRS = $(always_built_SUBDIRS) $(sometimes_built_SUBDIRS)
diff --git a/configure.in b/configure.in
index adc4c0002..5be45aa89 100644
--- a/configure.in
+++ b/configure.in
@@ -223,6 +223,10 @@ help-browser/gnome-man2html/Makefile
 help-browser/gnome-info2html/Makefile
 gmenu/Makefile
 control-center/Makefile
+capplets/Makefile
+capplets/mouse-properties/Makefile
+capplets/background-properties/Makefile
+capplets/desktop-links/Makefile
 pixmaps/Makefile
 gsm/Makefile
 smproxy/Makefile