diff --git a/ChangeLog b/ChangeLog
index dc2476b0c..086d84924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-25  Chema Celorio  <chema@celorio.com>
+
+	(capplet_modules): add bonobo_conf back. 
+
 2001-07-25  Chema Celorio  <chema@celorio.com>
 
 	* configure.in (GNOMECC_CAPPLETS_OAF_FILE_IN_RULE): scape correctly the
diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index 1b7dd7c11..636f1de08 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-25  Chema Celorio  <chema@celorio.com>
+
+	* Makefile.am ($(oaffile)): remove the oaffile_IN_RULE macro and copy
+	it here
+
 2001-07-24  Bradford Hovinen  <hovinen@ximian.com>
 
 	* main.c (setup_dialog): Use bonobo_peditor_option_menu_construct
diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am
index 8b7b14c9c..30890cf40 100644
--- a/capplets/background/Makefile.am
+++ b/capplets/background/Makefile.am
@@ -31,12 +31,14 @@ oafdir = $(datadir)/oaf
 oaf_DATA = Bonobo_Control_Capplet_background_properties.oaf
 oaffile = $(oaf_DATA)
 
+$(oaffile): %.oaf: %.oaf.in
+	sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
+
 ##
 ## You should not need to modify anything below this line
 ##
 @XML_I18N_MERGE_DESKTOP_RULE@
 @GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
-@GNOMECC_CAPPLETS_OAF_FILE_IN_RULE@
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index 01eea4fbb..186205b1a 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-25  Chema Celorio  <chema@celorio.com>
+
+	* Makefile.am: remove the OAF_FILE_IN_RULE and copy it here
+
 2001-07-24  Richard Hestilow  <hestilow@ximian.com>
 	
 	* main.c (main): Pass in legacy files to capplet_init.
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index 1cc86b8a1..d691c1753 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -28,15 +28,14 @@ defaults_DATA = keyboard-properties.xml
 oafdir = $(datadir)/oaf
 oaf_DATA = Bonobo_Control_Capplet_keyboard_properties.oaf
 
-###$(oaffile): %.oaf: %.oaf.in
-###	sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
+$(oaffile): %.oaf: %.oaf.in
+	sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
 
 ##
 ## You should not need to modify anything below this line
 ##
 @XML_I18N_MERGE_DESKTOP_RULE@
 @GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
-@GNOMECC_CAPPLETS_OAF_FILE_IN_RULE@
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index 5322d04d7..d200cb6c3 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-25  Chema Celorio  <chema@celorio.com>
+
+	* Makefile.am: remove the OAF_FILE_IN_RULE and copy it here
+
 2001-07-25  Bradford Hovinen  <hovinen@ximian.com>
 
 	* prefs-widget.c (prefs_widget_init): Fix macro name
diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am
index 9060bba2c..df0a7e3d5 100644
--- a/capplets/sound/Makefile.am
+++ b/capplets/sound/Makefile.am
@@ -33,12 +33,14 @@ oafdir = $(datadir)/oaf
 oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf
 oaffile = $(oaf_DATA)
 
+$(oaffile): %.oaf: %.oaf.in
+	sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
+
 ##
 ## You should not need to modify anything below this line
 ##
 @XML_I18N_MERGE_DESKTOP_RULE@
 @GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
-@GNOMECC_CAPPLETS_OAF_FILE_IN_RULE@
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
diff --git a/configure.in b/configure.in
index 06b4b1524..b0d496d86 100644
--- a/configure.in
+++ b/configure.in
@@ -197,11 +197,8 @@ install-data-local:\
 	$(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup)\
 	$(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop)\
 install-data-am: install-data-local'
-GNOMECC_CAPPLETS_OAF_FILE_IN_RULE='$(oaffile): \%.oaf: \%.oaf.in\
-	sed -e \"s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#\" < $< \> ${oaffile}'
 AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
 s%@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@%[$]GNOMECC_CAPPLETS_DESKTOP_IN_RULE%g
-s%@GNOMECC_CAPPLETS_OAF_FILE_IN_RULE@%[$]GNOMECC_CAPPLETS_OAF_FILE_IN_RULE%g
 AC_DIVERT_POP()dnl
 
 # Redirect the config.log output again, so that the ltconfig log is not