diff --git a/Makefile.am b/Makefile.am
index 7f577e078..59693e0fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = po libwindow-settings libgnome-control-center shell capplets panels \
 	  font-viewer help docs
-DIST_SUBDIRS = po libwindow-settings capplets font-viewer help shell typing-break examples
+DIST_SUBDIRS = po libwindow-settings capplets font-viewer help shell typing-break docs examples panels libgnome-control-center
 
 if HAVE_TYPING_BREAK
 SUBDIRS += typing-break
@@ -47,7 +47,7 @@ EXTRA_DIST = \
 	MAINTAINERS \
 	gnome-doc-utils.make
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb --enable-gtk-doc --enable-examples
 
 GITIGNOREFILES=m4
 
diff --git a/configure.ac b/configure.ac
index 6aa93d38e..538512b2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,6 @@ m4_define([gnome_control_center_version], 2.31.1)
 AC_INIT([gnome-control-center], [gnome_control_center_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])
 
-AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([shell])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/docs/reference/libgnome-control-center/Makefile.am b/docs/reference/libgnome-control-center/Makefile.am
index c6e6ccd61..3487cff6d 100644
--- a/docs/reference/libgnome-control-center/Makefile.am
+++ b/docs/reference/libgnome-control-center/Makefile.am
@@ -66,7 +66,7 @@ HTML_IMAGES=
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
+content_files=version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fbcabf4b9..ca306011a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -64,10 +64,10 @@ capplets/keyboard/gnome-keyboard-properties-xkbmc.c
 capplets/keyboard/gnome-keyboard-properties-xkbot.c
 capplets/keyboard/gnome-keyboard-properties-xkbpv.c
 capplets/keyboard/keyboard.desktop.in.in
-capplets/mouse/gnome-mouse-accessibility.c
-capplets/mouse/gnome-mouse-properties.c
-[type: gettext/glade]capplets/mouse/gnome-mouse-properties.ui
-capplets/mouse/gnome-settings-mouse.desktop.in.in
+panels/mouse/gnome-mouse-accessibility.c
+panels/mouse/gnome-mouse-properties.c
+[type: gettext/glade]panels/mouse/gnome-mouse-properties.ui
+panels/mouse/gnome-settings-mouse.desktop.in.in
 capplets/network/gnome-network-properties.c
 capplets/network/gnome-network-properties.desktop.in.in
 [type: gettext/glade]capplets/network/gnome-network-properties.ui
@@ -78,7 +78,7 @@ libwindow-settings/gnome-wm-manager.c
 libwindow-settings/metacity-window-manager.c
 shell/control-center.c
 shell/control-center.schemas.in
-shell/gnomecc.desktop.in.in
+shell/gnome-control-center.desktop.in.in
 shell/gnomecc.directory.in
 typing-break/drw-break-window.c
 typing-break/drwright.c
@@ -87,10 +87,8 @@ font-viewer/fontilus.schemas.in
 font-viewer/font-view.c
 font-viewer/gnome-font-viewer.desktop.in.in
 font-viewer/font-thumbnailer.c
-libslab/app-shell.c
-libslab/application-tile.c
-libslab/bookmark-agent.c
-libslab/directory-tile.c
-libslab/document-tile.c
-libslab/search-bar.c
-libslab/system-tile.c
+examples/gnome-example-panel.desktop.in.in
+panels/mouse/gnome-settings-mouse.desktop.in.in
+shell/gnome-control-center.desktop.in.in
+[type: gettext/glade]shell/shell.ui
+
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1ac7639c3..77ba691f3 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -22,3 +22,10 @@ capplets/localization/localization.ui
 schemas/apps_gnome_settings_daemon_default_editor.schemas.in
 schemas/apps_gnome_settings_daemon_keybindings.schemas.in
 schemas/apps_gnome_settings_daemon_screensaver.schemas.in
+examples/gnome-example-panel.desktop.in
+panels/mouse/gnome-settings-mouse.desktop.in
+shell/gnome-control-center.desktop.in
+examples/gnome-example-panel.desktop.in
+panels/mouse/gnome-settings-mouse.desktop.in
+shell/gnome-control-center.desktop.in
+
diff --git a/shell/Makefile.am b/shell/Makefile.am
index b88055389..1e981e128 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -20,7 +20,6 @@ cc-shell-marshal.c: cc-shell-marshal.list
 
 gnome_control_center_SOURCES =			\
 	control-center.c			\
-	control-center.h			\
 	gnome-control-center.c			\
 	gnome-control-center.h			\
 	shell-search-renderer.c			\