diff --git a/ChangeLog b/ChangeLog
index 3b70bc28d..af83d2fa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2007-01-31  Christian Persch  <chpe@svn.gnome.org>
+
+	* capplets/accessibility/at-properties/Makefile.am:
+	* capplets/accessibility/keyboard/Makefile.am:
+	* capplets/background/Makefile.am:
+	* capplets/common/Makefile.am:
+	* capplets/default-applications/Makefile.am:
+	* capplets/display/Makefile.am:
+	* capplets/font/Makefile.am:
+	* capplets/keybindings/Makefile.am:
+	* capplets/keyboard/Makefile.am:
+	* capplets/mouse/Makefile.am:
+	* capplets/network/Makefile.am:
+	* capplets/theme-switcher/Makefile.am:
+	* capplets/ui-properties/Makefile.am:
+	* capplets/windows/Makefile.am:
+	* configure.in:
+	* gnome-settings-daemon/Makefile.am:
+	* libbackground/Makefile.am:
+	* libwindow-settings/Makefile.am:
+	* typing-break/Makefile.am:
+	* vfs-methods/fontilus/Makefile.am:
+	* vfs-methods/themus/Makefile.am: Fix localedir defines. Bug #395383.
+
 2007-01-30  Jens Granseuer  <jensgr@gmx.net>
 
 	* configure.in: dump remnants of gstreamer-0.8 since it's not been
diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am
index 2aa2525e9..ba69aa465 100644
--- a/capplets/accessibility/at-properties/Makefile.am
+++ b/capplets/accessibility/at-properties/Makefile.am
@@ -24,6 +24,7 @@ glade_DATA = at-enable-dialog.glade
 INCLUDES   = $(AT_CAPPLET_CFLAGS)     \
              $(GNOMECC_CAPPLETS_CFLAGS) \
 	     -DGLADEDIR=\""$(gladedir)"\" \
-	     -DPIXMAPDIR=\""$(pixmapdir)"\"
+	     -DPIXMAPDIR=\""$(pixmapdir)"\" \
+	     -DGNOMELOCALEDIR="\"$(datadir)/locale\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(glade_DATA) $(pixmap_DATA)
diff --git a/capplets/accessibility/keyboard/Makefile.am b/capplets/accessibility/keyboard/Makefile.am
index 1ee9af4f1..8d0f77c2e 100644
--- a/capplets/accessibility/keyboard/Makefile.am
+++ b/capplets/accessibility/keyboard/Makefile.am
@@ -30,7 +30,7 @@ desktopdir = $(datadir)/applications
 Desktop_in_files = accessibility-keyboard.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA)
 
diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am
index d965715a9..9970c1911 100644
--- a/capplets/background/Makefile.am
+++ b/capplets/background/Makefile.am
@@ -2,6 +2,7 @@ WALLPAPER_DATADIR = $(datadir)/gnome-background-properties
 
 INCLUDES = \
 	$(GNOMECC_CAPPLETS_CFLAGS) \
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
 	-DWALLPAPER_DATADIR=\""$(WALLPAPER_DATADIR)"\"
 
 bin_PROGRAMS = gnome-background-properties
diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am
index c636729d0..f3aaad0d8 100644
--- a/capplets/common/Makefile.am
+++ b/capplets/common/Makefile.am
@@ -1,7 +1,7 @@
 EXTRA_DIST = ChangeLog wrapper-script.in Bonobo_Control_Capplet_generic.oaf.in
 
 INCLUDES = \
-        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 		\
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""			\
 	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
 	-DG_LOG_DOMAIN=\"capplet-common\"				\
 	-DINSTALL_PREFIX=\"$(prefix)\"					\
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index d828fa02a..3e082ce0c 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -24,6 +24,7 @@ INCLUDES   = 					\
 	$(GNOMECC_CAPPLETS_CFLAGS)		\
 	$(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS)	\
 	-DGLADEDIR=\""$(gladedir)"\"		\
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""\
 	-DDATADIR=\""$(datadir)"\"
 
 noinst_DATA = gnome-default-applications.xml.in
diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am
index 886ca1b39..56b4ac38a 100644
--- a/capplets/display/Makefile.am
+++ b/capplets/display/Makefile.am
@@ -20,6 +20,7 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 INCLUDES   = $(DISPLAY_CAPPLET_CFLAGS)     \
              $(GNOMECC_CAPPLETS_CFLAGS) \
 	     -DGLADEDIR=\""$(gladedir)"\" \
+	     -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
 	     -DPIXMAPDIR=\""$(pixmapdir)"\"
 
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
diff --git a/capplets/font/Makefile.am b/capplets/font/Makefile.am
index ca2ccf097..ac56b917d 100644
--- a/capplets/font/Makefile.am
+++ b/capplets/font/Makefile.am
@@ -28,6 +28,7 @@ glade_DATA = font-properties.glade
 INCLUDES   = $(FONT_CAPPLET_CFLAGS)     \
              $(GNOMECC_CAPPLETS_CFLAGS) \
 	     -DGLADEDIR=\""$(gladedir)"\" \
+	     -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
 	     -DPIXMAPDIR=\""$(pixmapdir)"\"
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(glade_DATA) $(pixmap_DATA)
diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
index cbbc59de7..bec9bb72d 100644
--- a/capplets/keybindings/Makefile.am
+++ b/capplets/keybindings/Makefile.am
@@ -17,7 +17,7 @@ desktopdir = $(datadir)/applications
 Desktop_in_files = keybinding.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA)
 
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index 61fba6b37..44d773f5a 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -27,6 +27,6 @@ desktopdir = $(datadir)/applications
 Desktop_in_files = keyboard.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBGNOMEKBDUI_CFLAGS)
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBGNOMEKBDUI_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA)
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index cd954709d..0b8263a6f 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -31,6 +31,6 @@ desktopdir = $(datadir)/applications
 Desktop_in_files = gnome-settings-mouse.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA) $(cursorfont_DATA)
diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am
index fe966faf6..b2a0d974b 100644
--- a/capplets/network/Makefile.am
+++ b/capplets/network/Makefile.am
@@ -13,6 +13,6 @@ desktopdir = $(datadir)/applications
 desktop_in_files = gnome-network-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(glade_DATA)
diff --git a/capplets/theme-switcher/Makefile.am b/capplets/theme-switcher/Makefile.am
index 0d44f473d..d809191d8 100644
--- a/capplets/theme-switcher/Makefile.am
+++ b/capplets/theme-switcher/Makefile.am
@@ -1,7 +1,5 @@
 bin_PROGRAMS = gnome-theme-manager
 
-
-
 pixmapdir = $(GNOMECC_PIXMAPS_DIR)
 pixmap_DATA = \
 	theme-thumbnailing.png
@@ -49,7 +47,8 @@ INCLUDES   = 				\
 	-I$(top_srcdir)			\
 	$(METACITY_CFLAGS)		\
 	$(GNOMECC_CAPPLETS_CFLAGS)	\
-	-DGLADEDIR=\""$(gladedir)"\"
+	-DGLADEDIR=\""$(gladedir)"\"	\
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
 
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xml_files)
 EXTRA_DIST = $(glade_DATA) gnome-theme-save-data.c $(pixmap_DATA) $(xml_in_files)
diff --git a/capplets/ui-properties/Makefile.am b/capplets/ui-properties/Makefile.am
index 306ba9bae..80a58e875 100644
--- a/capplets/ui-properties/Makefile.am
+++ b/capplets/ui-properties/Makefile.am
@@ -13,6 +13,6 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 Gladedir   = $(GNOMECC_GLADE_DIR)
 Glade_DATA = gnome-ui-properties.glade
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA)
diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am
index 1f9fa9271..1d8247e9e 100644
--- a/capplets/windows/Makefile.am
+++ b/capplets/windows/Makefile.am
@@ -19,6 +19,7 @@ INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)					\
 	     -I$(top_srcdir)/libwindow-settings \
 	     -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \
 	     -DGLADEDIR=\""$(gladedir)"\"  	\
+	     -DGNOMELOCALEDIR="\"$(datadir)/locale\""			\
 	     -DPIXMAPDIR=\""$(pixmapdir)"\"
 
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
diff --git a/configure.in b/configure.in
index cc0d0de2b..1d7754cac 100644
--- a/configure.in
+++ b/configure.in
@@ -5,13 +5,9 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([shell])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 tar-ustar])
 AM_MAINTAINER_MODE
 
-AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
-
-GNOME_COMPILE_WARNINGS
-
 AC_ISC_POSIX
 AC_PROG_CC
 AC_STDC_HEADERS
@@ -47,7 +43,10 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 
 AM_GLIB_GNU_GETTEXT
 
-GLIB_DEFINE_LOCALEDIR(GNOMELOCALEDIR)
+GNOME_COMMON_INIT
+GNOME_DEBUG_CHECK
+GNOME_COMPILE_WARNINGS([maximum])
+GNOME_MAINTAINER_MODE_DEFINES
 
 AC_CHECK_FUNCS(usleep)
 AC_CHECK_FUNCS(putenv)
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index 52ed1ff40..047426195 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = xrdb actions
 INCLUDES=$(DBUS_CFLAGS) $(LIBGNOMEKBD_CFLAGS) $(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) \
   -DDATADIR="\"$(datadir)\""			\
   -DPIXMAPSDIR="\"$(GNOMECC_PIXMAPS_DIR)\""	\
+  -DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
   $(FB_CFLAGS)
 
 libexec_PROGRAMS=gnome-settings-daemon
diff --git a/libbackground/Makefile.am b/libbackground/Makefile.am
index dea0e01c1..0486b2be7 100644
--- a/libbackground/Makefile.am
+++ b/libbackground/Makefile.am
@@ -2,6 +2,7 @@ EXTRA_DIST = ChangeLog
 
 INCLUDES = \
 	-DG_LOG_DOMAIN=\"capplet-common\"				\
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""			\
 	-I$(top_srcdir)/						\
 	@CAPPLET_CFLAGS@
 
diff --git a/libwindow-settings/Makefile.am b/libwindow-settings/Makefile.am
index bef9349fe..a365527fa 100644
--- a/libwindow-settings/Makefile.am
+++ b/libwindow-settings/Makefile.am
@@ -1,8 +1,8 @@
 WM_MODULE_DIR=$(libdir)/window-manager-settings
 
 INCLUDES = 								\
-        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 		\
-	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""			\
+	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"			\
 	-DG_LOG_DOMAIN=\"capplet-common\"				\
 	-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \
 	-I$(top_srcdir)/						\
diff --git a/typing-break/Makefile.am b/typing-break/Makefile.am
index f4fead043..99db04326 100644
--- a/typing-break/Makefile.am
+++ b/typing-break/Makefile.am
@@ -1,7 +1,3 @@
-INCLUDES =						\
-	@GNOME_CFLAGS@					\
-	-DIMAGEDIR=\"$(GNOMECC_PIXMAPS_DIR)\"
-
 bin_PROGRAMS = gnome-typing-monitor
 
 gnome_typing_monitor_SOURCES =			\
@@ -17,6 +13,14 @@ gnome_typing_monitor_SOURCES =			\
 	drw-selection.c				\
 	drw-selection.h
 
+gnome_typing_monitor_CPPFLAGS = \
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+	-DIMAGEDIR=\"$(GNOMECC_PIXMAPS_DIR)\"		\
+	$(AM_CPPFLAGS)
+gnome_typing_monitor_CFLAGS = \
+	@GNOME_CFLAGS@	\
+	$(AM_CFLAGS)
+
 gnome_typing_monitor_LDADD = @GNOME_LIBS@ @SCREENSAVER_LIBS@
 gnome_typing_monitor_LDFLAGS = -export-dynamic
 
diff --git a/vfs-methods/fontilus/Makefile.am b/vfs-methods/fontilus/Makefile.am
index 718380403..0834e66d5 100644
--- a/vfs-methods/fontilus/Makefile.am
+++ b/vfs-methods/fontilus/Makefile.am
@@ -1,6 +1,7 @@
 
 INCLUDES = $(FONT_METHOD_CFLAGS) $(FONT_THUMBNAILER_CFLAGS) $(FONT_VIEW_CFLAGS) \
-  $(FONT_CONTEXT_MENU_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" 
+  $(FONT_CONTEXT_MENU_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" \
+  -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 
 vfsmoduledir = $(libdir)/gnome-vfs-2.0/modules
 vfsmodule_LTLIBRARIES = libfont-method.la
diff --git a/vfs-methods/themus/Makefile.am b/vfs-methods/themus/Makefile.am
index 8daf94657..7fc99df51 100644
--- a/vfs-methods/themus/Makefile.am
+++ b/vfs-methods/themus/Makefile.am
@@ -5,7 +5,8 @@ INCLUDES = $(THEME_METHOD_CFLAGS) \
   -I$(top_srcdir)/capplets/common \
   -DGNOMECC_GLADE_DIR=\"$(GNOMECC_GLADE_DIR)\" \
   -DDIRECTORY_DIR=\"$(directorydir)\" \
-  -DDATA_DIR=\"$(datadir)/themus\"
+  -DDATA_DIR=\"$(datadir)/themus\" \
+  -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 
 bin_PROGRAMS = gnome-theme-thumbnailer themus-theme-applier