diff --git a/ChangeLog b/ChangeLog
index 03d63dc73..9259ad084 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2001-07-17  Chema Celorio  <chema@celorio.com>
 
+	* acconfig.h: define GNOMECC_ICONS_DIR
+
 	* configure.in (vers): requre pkg-config 0.8.0
 	(GNOME_CONTROL_CENTER_ICONS_DIR): add
+	(GNOMECC_CAPPLETS_CFLAGS): define
 
 2001-07-16  Richard Hestilow  <hestilow@ximian.com>
 	
diff --git a/acconfig.h b/acconfig.h
index 006084621..61b43143f 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -8,6 +8,7 @@
 #undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
 #undef HAVE_PROGRAM_INVOCATION_NAME
 #undef HAVE_XIMIAN_ARCHIVER
+#undef GNOMECC_ICONS_DIR
 #undef PACKAGE
 #undef VERSION
 
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index de4bc3f99..189a8826b 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -3,33 +3,21 @@
 cappletname=keyboard
 
 Gladedir = $(datadir)/control-center-data
-Glade_DATA = \
-	keyboard-properties.glade
-
-iconsdir = $(GNOME_CONTROL_CENTER_ICONS_DIR)
-icons_DATA = keyboard-capplet.png
+Glade_DATA = $(cappletname)-properties.glade
 
 EXTRA_DIST = \
-  ChangeLog \
   $(Glade_DATA) \
-  $(cappletname)-properties.desktop \
-  $(cappletname)-properties.desktop.in \
-  $(cappletname)-properties.desktop.in.in 
+  $(GNOMECC_CAPPLETS_EXTRA_DIST)
 
 INCLUDES = \
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"	\
-	-DG_LOG_DOMAIN=\"keyboard-properties\"		\
-	-DGLADE_DATADIR=\""$(Gladedir)"\"		\
-	@CAPPLET_CFLAGS@				\
-	-I$(top_srcdir)/				\
-	-I$(top_srcdir)/intl				
+     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+	@GNOMECC_CAPPLETS_CFLAGS@
 
 bin_PROGRAMS = keyboard-properties
 
 keyboard_properties_SOURCES = \
 	prefs-widget.c prefs-widget.h \
-	preferences.c preferences.h \
+	preferences.c  preferences.h \
 	main.c
 
 keyboard_properties_LDADD = @CAPPLET_LIBS@ $(XF86MISC_LIBS)
diff --git a/capplets/keyboard/main.c b/capplets/keyboard/main.c
index 70392d04b..d0ec43d57 100644
--- a/capplets/keyboard/main.c
+++ b/capplets/keyboard/main.c
@@ -258,7 +258,7 @@ main (int argc, char **argv)
 	}
 
 	gnome_window_icon_set_default_from_file
-		(GNOME_ICONDIR"/gnome-cckeyboard.png");
+		(GNOMECC_ICONS_DIR"keyboard-capplet.png.png");
 
 #ifdef HAVE_XIMIAN_ARCHIVER
 	archive = ARCHIVE (archive_load (FALSE));
diff --git a/configure.in b/configure.in
index 915032ac0..11d5487ab 100644
--- a/configure.in
+++ b/configure.in
@@ -115,6 +115,14 @@ PKG_CHECK_MODULES(ARCHIVER, bonobo bonobo_conf xml)
 PKG_CHECK_MODULES(MONIKER, bonobo bonobo_conf xml)
 PKG_CHECK_MODULES(CONFIG_ARCHIVER, gnome xml)
 
+GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} -I\$(top_srcdir)/intl -I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"keyboard-properties\\\"\" -DGLADE_DATADIR=\"\\\"${datadir}/control-center\\\"\""
+
+AC_DEFINE_UNQUOTED(GNOMECC_ICONS_DIR, "${datadir}/${PACKAGE}/icons")
+GNOMECC_ICONS_DIR=""${datadir}/${PACKAGE}/icons""
+AC_SUBST(GNOMECC_ICONS_DIR)
+
+AC_SUBST(GNOMECC_CAPPLETS_CFLAGS)
+
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 
@@ -130,8 +138,9 @@ AC_SUBST(CONFIG_ARCHIVER_LIBDIR)
 AC_SUBST(CONFIG_ARCHIVER_LIBS)
 AC_SUBST(CONFIG_ARCHIVER_INCLUDEDIR)
 
-GNOME_CONTROL_CENTER_ICONS_DIR="${datadir}/${PACKAGE}/icons"
-AC_SUBST(GNOME_CONTROL_CENTER_ICONS_DIR)
+GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(cappletname)-properties.desktop \$(cappletname)-properties.desktop.in \$(cappletname)-properties.desktop.in.in"
+
+AC_SUBST(GNOMECC_CAPPLETS_EXTRA_DIST)
 
 AC_OUTPUT([
 control-center.spec