diff --git a/ChangeLog b/ChangeLog
index 3cd136c98..e98f44a7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-10-26  Bradford Hovinen  <hovinen@ximian.com>
 
+	* capplets/Makefile.am: Remove screensaver from
+	always_built_SUBDIRS and add $(SCREENSAVER) to SUBDIRS
+
+	* capplets/{background|keyboard|mouse|sound}/Makefile.am:
+	Fix so that automake does not choke on these files
+
 	* README: Updated to reflect current status porting to GNOME 2
 
 	* configure.in: Cleanup for GNOME 2 port
diff --git a/capplets/Makefile.am b/capplets/Makefile.am
index a0d4db39c..76e5ff46d 100644
--- a/capplets/Makefile.am
+++ b/capplets/Makefile.am
@@ -1,7 +1,5 @@
-always_built_SUBDIRS =						\
-	common background keyboard mouse screensaver sound 	\
+always_built_SUBDIRS =				\
+	common background keyboard mouse sound	\
 	default-applications desktop-links
 
-#rollback
-
-SUBDIRS =  $(always_built_SUBDIRS)
+SUBDIRS =  $(always_built_SUBDIRS) $(SCREENSAVER)
diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am
index f26710156..300cf05ef 100644
--- a/capplets/background/Makefile.am
+++ b/capplets/background/Makefile.am
@@ -20,7 +20,6 @@ defaults_DATA = background-properties.xml
 
 oafdir = $(datadir)/oaf
 oaf_DATA = Bonobo_Control_Capplet_background_properties.oaf
-oaffile = $(oaf_DATA)
 
 ##
 ## You should not need to modify anything below this line
@@ -31,8 +30,8 @@ $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
 	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
 	chmod a+x $@
 
-$(oaffile): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
-	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > ${oaffile}
+$(oaf_DATA): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
+	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > $@
 
 ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 $(desktop).in: %.desktop.in: %.desktop.in.in
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index eab2a6975..fc1303589 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -17,7 +17,6 @@ defaults_DATA = keyboard-properties.xml
 
 oafdir = $(datadir)/oaf
 oaf_DATA = Bonobo_Control_Capplet_keyboard_properties.oaf
-oaffile = $(oaf_DATA)
 
 ##
 ## You should not need to modify anything below this line
@@ -28,8 +27,8 @@ $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
 	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
 	chmod a+x $@
 
-$(oaffile): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
-	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > ${oaffile}
+$(oaf_DATA): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
+	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > $@
 
 ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 $(desktop).in: %.desktop.in: %.desktop.in.in
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index da384d28b..883c439a9 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -17,7 +17,6 @@ defaults_DATA = mouse-properties.xml
 
 oafdir = $(datadir)/oaf
 oaf_DATA = Bonobo_Control_Capplet_mouse_properties.oaf
-oaffile = $(oaf_DATA)
 
 ##
 ## You should not need to modify anything below this line
@@ -28,8 +27,8 @@ $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
 	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
 	chmod a+x $@
 
-$(oaffile): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
-	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > ${oaffile}
+$(oaf_DATA): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
+	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > $@
 
 ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 $(desktop).in: %.desktop.in: %.desktop.in.in
diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am
index 72bd2eee7..bad964671 100644
--- a/capplets/sound/Makefile.am
+++ b/capplets/sound/Makefile.am
@@ -21,7 +21,6 @@ defaults_DATA = sound-properties.xml
 
 oafdir = $(datadir)/oaf
 oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf
-oaffile = $(oaf_DATA)
 
 ##
 ## You should not need to modify anything below this line
@@ -32,8 +31,8 @@ $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
 	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
 	chmod a+x $@
 
-$(oaffile): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
-	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > ${oaffile}
+$(oaf_DATA): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
+	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > $@
 
 ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 $(desktop).in: %.desktop.in: %.desktop.in.in