diff --git a/ChangeLog b/ChangeLog
index 29692c702..544578310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-11-10  Mark McLoughlin  <mark@skynet.ie>
+
+	* configure.in: require libgnome-menu for the shell, fixup
+	other shell requirements and don't look for libnautilus
+	anymore.
+	
+	* Makefile.am: don't install control-center2.png anymore.
+	
+	* control-center2.png: remove.
+
 2004-11-09  Mark McLoughlin  <mark@skynet.ie>
 
 	* configure.in: remove $GNOMECC_DESKTOP_DIR
diff --git a/Makefile.am b/Makefile.am
index 669415722..e00b87873 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,9 +8,6 @@ SUBDIRS = po libsounds libbackground libwindow-settings libgswitchit libkbdraw g
 # in the configure.in file. Since we are not using it now, i will
 # remove it from the default build. Chema
 
-pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = control-center2.png
-
 dist-hook: control-center.spec
 	cp control-center.spec $(distdir)
 
diff --git a/configure.in b/configure.in
index 0cbbca37d..b8e83695f 100644
--- a/configure.in
+++ b/configure.in
@@ -90,7 +90,7 @@ dnl ==============================================
 
 COMMON_MODULES="gtk+-2.0 >= 2.3.0 gconf-2.0 libgnomeui-2.0 >= 2.2.0 libglade-2.0 >= 1.99.12 libbonobo-2.0 libbonoboui-2.0 libglade-2.0 gconf-2.0 gnome-desktop-2.0 >= 2.2.0"
 PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
-PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libxml-2.0 gnome-desktop-2.0 gnome-vfs-2.0)
+PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.9.1)
 PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, gtk+-2.0 gconf-2.0 libgnomeui-2.0 esound gnome-desktop-2.0 libglade-2.0)
 PKG_CHECK_MODULES(OLD_CAPPLET, libgnomeui-2.0 libglade-2.0)
 PKG_CHECK_MODULES(GNOME, libgnomeui-2.0)
@@ -261,11 +261,6 @@ AC_SUBST(LIBBONOBO_IDL_DIR)
 BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
 AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
 
-# check for nautilus
-PKG_CHECK_MODULES(NAUTILUS, libnautilus)
-AC_SUBST(NAUTILUS_LIBS)
-AC_SUBST(NAUTILUS_CFLAGS)
-
 # esd
 ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound`
 if test x"$ESDSERVERDIR" = x; then
@@ -517,7 +512,6 @@ gnome-settings-daemon/Makefile
 gnome-settings-daemon/xrdb/Makefile
 gnome-settings-daemon/actions/Makefile
 control-center/Makefile
-control-center/GNOME_ControlCenter.server
 libbackground/Makefile
 libwindow-settings/Makefile
 libwindow-settings/gnome-window-settings-2.0.pc
diff --git a/control-center2.png b/control-center2.png
deleted file mode 100644
index ef385746a..000000000
Binary files a/control-center2.png and /dev/null differ