diff --git a/capplets/background/Bonobo_Control_Capplet_background_properties.oaf b/capplets/background/Bonobo_Control_Capplet_background_properties.oaf.in
similarity index 100%
rename from capplets/background/Bonobo_Control_Capplet_background_properties.oaf
rename to capplets/background/Bonobo_Control_Capplet_background_properties.oaf.in
diff --git a/capplets/sound/Bonobo_Control_Capplet_sound_properties.oaf b/capplets/sound/Bonobo_Control_Capplet_sound_properties.oaf.in
similarity index 95%
rename from capplets/sound/Bonobo_Control_Capplet_sound_properties.oaf
rename to capplets/sound/Bonobo_Control_Capplet_sound_properties.oaf.in
index c26ace6e2..0285e1920 100644
--- a/capplets/sound/Bonobo_Control_Capplet_sound_properties.oaf
+++ b/capplets/sound/Bonobo_Control_Capplet_sound_properties.oaf.in
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Bonobo_Control_Capplet_sound_properties_Factory" type="exe"
-	    location="sound-properties">
+	    location="REPLACEME_PLIZ">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am
index c8f31e17f..f1e20aa43 100644
--- a/capplets/sound/Makefile.am
+++ b/capplets/sound/Makefile.am
@@ -18,12 +18,14 @@ 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
 ##
 @XML_I18N_MERGE_DESKTOP_RULE@
 @GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
+@GNOMECC_CAPPLETS_OAF_FILE_IN_RULE@
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
@@ -34,4 +36,4 @@ pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
 Glade_DATA = $(cappletname)-properties.glade
 icons_DATA = $(cappletname)-capplet.png
 desktop    = $(cappletname).desktop
-all-local: $(desktop)
+all-local: $(desktop) $(oaffile)