diff --git a/ChangeLog b/ChangeLog
index 09b5ed8d0..4d4a15cfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* schemas/Makefile.am (schema_DATA): Add background, screensaver
 	files
+	(install-data-local): Allow specification of multiple schema files
 
 	* configure.in (GNOMECC_DESKTOP_DIR): Define
 	(GNOMECC_DATA_DIR): Define
diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am
index 7852e0fdd..4b8a792fc 100644
--- a/capplets/background/Makefile.am
+++ b/capplets/background/Makefile.am
@@ -16,5 +16,5 @@ desktop_DATA = background.desktop
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) -I$(top_srcdir)/libbackground
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(Glade_DATA) $(icons_DATA)
+EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(desktop_DATA)
 
diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 73109d6ae..35d62e783 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,5 +1,7 @@
 2001-12-20  Bradford Hovinen  <hovinen@ximian.com>
 
+	* Makefile.am: Clean up
+
 	* default-application-properties.c (main): Call gtk_main, not
 	capplet_gtk_main
 
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index 600fe32f0..5d5112c51 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -1,41 +1,21 @@
-cappletname = default-applications
-cappletgroup =
-bin_PROGRAMS = default-applications-properties
+bin_PROGRAMS = gnome-default-applications-properties
 
-default_applications_properties_LDADD = @OLD_CAPPLET_LIBS@
-default_applications_properties_SOURCES = \
-	default-application-properties.c \
-	interface.c		interface.h \
-	callbacks.c		callbacks.h \
-	support.c			support.h	\
+gnome_default_applications_properties_LDADD = @OLD_CAPPLET_LIBS@
+gnome_default_applications_properties_SOURCES = \
+	default-application-properties.c 	\
+	interface.c		interface.h 	\
+	callbacks.c		callbacks.h 	\
+	support.c		support.h	\
 	defaults.h
 
-pixmap_DATA =
-
-##
-## You should not need to modify anything below this line
-##
 @INTLTOOL_DESKTOP_RULE@
 
-####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
-$(desktop).in: %.desktop.in: %.desktop.in.in
-	sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)
-	$(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)$(desktop)
-
-install-data-am: install-data-local
-####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
-
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) @OLD_CAPPLET_CFLAGS@ 
-CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
 iconsdir   = $(GNOMECC_ICONS_DIR)
-Gladedir   = $(GNOMECC_GLADE_DIR)
-pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
-Glade_DATA = $(cappletname)-properties.glade
-icons_DATA = $(cappletname)-capplet.png
-desktop    = $(cappletname).desktop
-all-local: $(desktop)
+icons_DATA = default-applications-capplet.png
 
+desktopdir = $(GNOMECC_DESKTOP_DIR)
+desktop_DATA = default-applications.desktop
+
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) @OLD_CAPPLET_CFLAGS@
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+EXTRA_DIST = $(icons_DATA) $(desktop_DATA)
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index fa10ce317..21bf9337c 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -16,4 +16,4 @@ desktop_DATA = keyboard.desktop
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(Glade_DATA) $(icons_DATA)
+EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(desktop_DATA)
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index c925d5916..34a9a8bdb 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -24,4 +24,4 @@ desktop_DATA = mouse.desktop
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(pixmap_DATA)
+EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(desktop_DATA) $(pixmap_DATA)