diff --git a/acconfig.h b/acconfig.h
index 3c975de4e..a6d4aac74 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -7,7 +7,6 @@
 #undef HAVE_LIBSM
 #undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
 #undef HAVE_PROGRAM_INVOCATION_NAME
-#undef HAVE_BONOBO
 
 #undef GNOMECC_ICONS_DIR
 #undef GNOMECC_GLADE_DIR
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index 9ad1e7745..f4a539dc0 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -15,7 +15,7 @@ pixmap_DATA =
 ##
 ## You should not need to modify anything below this line
 ##
-@XML_I18N_MERGE_DESKTOP_RULE@
+@INTLTOOL_DESKTOP_RULE@
 
 ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 $(desktop).in: %.desktop.in: %.desktop.in.in
diff --git a/capplets/desktop-links/Makefile.am b/capplets/desktop-links/Makefile.am
index a23a91d60..32b2faf24 100644
--- a/capplets/desktop-links/Makefile.am
+++ b/capplets/desktop-links/Makefile.am
@@ -3,7 +3,7 @@ ccenterdir = $(datadir)/control-center/capplets
 Desktopdir = $(ccenterdir)
 Desktop_in_files = gnome-hint-properties.desktop.in
 Desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) 
-@XML_I18N_MERGE_DESKTOP_RULE@
+@INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = \
 	$(Desktop_in_files) 	
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index fc1303589..66024e7ec 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -21,7 +21,7 @@ oaf_DATA = Bonobo_Control_Capplet_keyboard_properties.oaf
 ##
 ## You should not need to modify anything below this line
 ##
-@XML_I18N_MERGE_DESKTOP_RULE@
+@INTLTOOL_DESKTOP_RULE@
 
 $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
 	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index 883c439a9..c08eb17b8 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -21,7 +21,7 @@ oaf_DATA = Bonobo_Control_Capplet_mouse_properties.oaf
 ##
 ## You should not need to modify anything below this line
 ##
-@XML_I18N_MERGE_DESKTOP_RULE@
+@INTLTOOL_DESKTOP_RULE@
 
 $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
 	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
diff --git a/capplets/rollback/Makefile.am b/capplets/rollback/Makefile.am
index cafda7b76..34973e174 100644
--- a/capplets/rollback/Makefile.am
+++ b/capplets/rollback/Makefile.am
@@ -9,7 +9,7 @@ rollback_capplet_SOURCES = \
 	rollback-capplet-dialog.c	rollback-capplet-dialog.h		\
 	main.c
 
-@XML_I18N_MERGE_DESKTOP_RULE@
+@INTLTOOL_DESKTOP_RULE@
 
 ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 $(desktop).in: %.desktop.in: %.desktop.in.in
diff --git a/capplets/screensaver/Makefile.am b/capplets/screensaver/Makefile.am
index 8d5dd4c68..ca0000fe7 100644
--- a/capplets/screensaver/Makefile.am
+++ b/capplets/screensaver/Makefile.am
@@ -24,7 +24,7 @@ pixmaps_DATA = no-hack.png blank-screen.png
 ##
 ## You should not need to modify anything below this line
 ##
-@XML_I18N_MERGE_DESKTOP_RULE@
+@INTLTOOL_DESKTOP_RULE@
 
 ####@###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 bad964671..28551a335 100644
--- a/capplets/sound/Makefile.am
+++ b/capplets/sound/Makefile.am
@@ -25,7 +25,7 @@ oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf
 ##
 ## You should not need to modify anything below this line
 ##
-@XML_I18N_MERGE_DESKTOP_RULE@
+@INTLTOOL_DESKTOP_RULE@
 
 $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
 	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
diff --git a/control-center/Makefile.am b/control-center/Makefile.am
index 3d400a0f3..533704121 100644
--- a/control-center/Makefile.am
+++ b/control-center/Makefile.am
@@ -11,7 +11,7 @@ splash_DATA = \
 sysdir = $(datadir)/gnome/apps/Settings
 sys_in_files = gnomecc.desktop.in
 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
-@XML_I18N_MERGE_DESKTOP_RULE@
+@INTLTOOL_DESKTOP_RULE@
 
 gladedir = $(datadir)/control-center/interfaces
 glade_DATA = \
diff --git a/control-center/main.c b/control-center/main.c
index 87c118498..4ea5a0863 100644
--- a/control-center/main.c
+++ b/control-center/main.c
@@ -27,12 +27,8 @@
 
 #include <gnome.h>
 #include <glade/glade.h>
-
 #include <bonobo.h>
-
-#ifdef GTKHTML_HAVE_GCONF
 #include <gconf/gconf.h>
-#endif
 
 #include "capplet-dir.h"
 #include "capplet-dir-view.h"
@@ -79,9 +75,7 @@ main (int argc, char **argv)
 	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
 		g_error ("Cannot initialize bonobo");
 
-#ifdef GTKHTML_HAVE_GCONF
 	gconf_init (argc, argv, NULL);
-#endif
 
 	if (capplet == NULL) {
 		gnomecc_init ();