diff --git a/ChangeLog b/ChangeLog
index 8497b61f..237b82c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,14 +38,16 @@ Changes since version 0.53.0:
 - fixed crash when moving internal window with kbd
 - fixed compilation problem on IRIX machines (Neil Muller
 						<neil@octane.sun.ac.za>)
-- made images with a transparent color used a background use the default color
-  (Nicolas <NV04@wanadoo.fr>)
 - replace xde support drop on dock with xdnd.
 - added an (internal use) environment variable for telling WPrefs whats's
   the name of the wmaker binary being ran.
 - more elegant text entries in Clip's menu, regarding single/multiple
   selected icons.
-
+- fixed cosmetic bug in geom. dpy window for 8bpp
+- removed --enable-kanji and added MultiByteText option
+- rewrote font code to use WINGs
+- made autoraise only work for the active window
+- fixed compilation problem with OpenWindows and other non-X11R6 systems..
 
 Changes since version 0.52.0:
 .............................
diff --git a/INSTALL b/INSTALL
index 92cebc59..ea277cd7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -129,10 +129,9 @@ CONFIGURE OPTIONS:
 These options can be passed to the configure script to enable/disable
 some Window Maker features. Example:
 
-./configure --enable-kanji
+./configure --enable-kde --enable-gnome
 
-will configure Window Maker with kanji (and other multi-byte) characters
-support compiled in.
+will configure Window Maker with KDE and GNOME supported compiled in.
 
 
 To get a list of other options, run ./configure --help
@@ -147,10 +146,6 @@ To get a list of other options, run ./configure --help
 	The -I flag must precede each paths, like:
 	--with-incs-from="-I/opt/headers -I/usr/local/include"
 
---enable-kanji
-	support to display Kanji characters, Korean, Chinese and other
-	languagues that require special characters.
-
 --enable-single-icon
 	enables the collapsing of all appicons of the WM_CLASS+WM_INSTANCE
 	into a single one. This feature is not supported at all by the
@@ -342,9 +337,9 @@ following.
 	to get a complete listing of other options that are available.
 
 	2. Run configure with the options you want. For example, if you
-	want to use the --enable-kanji option, type:
+	want to use the --enable-kde option, type:
 
-	./configure --enable-kanji
+	./configure --enable-kde
 
 	3. (optional) Edit src/wconfig.h with your favorite text editor 
 	and browse through it for some options you might want to change.
@@ -522,7 +517,8 @@ Read po/README if you wish to translate and maintain locale files
 for other languages.
 
 2 - Additionally, if your language uses multi-byte characters, such
-as Japanese or Korean, you must supply the --enable-kanji flag to configure.
+as Japanese or Korean, you must set the MultiByteText option to YES
+in ~/GNUstep/Defaults/WMGLOBAL and ~/GNUstep/Defaults/WindowMaker
 
 3 - Configure, build and install Window Maker normally.
 
@@ -573,3 +569,6 @@ BoldSystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
 
 The above 2 fonts are only used by applications that use WINGs (WindowMaker
 and WPrefs.app)
+
+The wsetfont script that's supplied will allow you to change the font
+settings in a easier way. Take a look in the script for details on usage.
diff --git a/Makefile.in b/Makefile.in
index c20711ed..5013e787 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -113,9 +113,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -282,6 +282,11 @@ distdir: $(DISTFILES)
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/NEWS b/NEWS
index 42771ec5..d4143589 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,17 @@ will load the theme, but keep the titlebar background related options as
 before.
 
 
+MultiByte Text Support Changes
+------------------------------
+
+The --enable-kanji configure option is not needed anymore and was removed.
+To enable support for multibyte text, you must:
+- set the LANG environment variable to the appropriate value
+- change the font configurations to contain font sets in the appropriate
+  encodings in both ~/G/D/WindowMaker and ~/G/D/WMGLOBAL (for WPrefs)
+- set the MultiByteText option to YES in both of the above files
+
+
 New Options
 -----------
 
diff --git a/WindowMaker/Backgrounds/Makefile.in b/WindowMaker/Backgrounds/Makefile.in
index a45ab163..e0434e61 100755
--- a/WindowMaker/Backgrounds/Makefile.in
+++ b/WindowMaker/Backgrounds/Makefile.in
@@ -111,9 +111,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Backgrounds/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Backgrounds/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -145,6 +145,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/Backgrounds
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Backgrounds/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WindowMaker/Defaults/Makefile.in b/WindowMaker/Defaults/Makefile.in
index e17c3924..990cac34 100755
--- a/WindowMaker/Defaults/Makefile.in
+++ b/WindowMaker/Defaults/Makefile.in
@@ -113,9 +113,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Defaults/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Defaults/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -147,6 +147,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/Defaults
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Defaults/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WindowMaker/IconSets/Makefile.in b/WindowMaker/IconSets/Makefile.in
index 6608659c..1fbca671 100755
--- a/WindowMaker/IconSets/Makefile.in
+++ b/WindowMaker/IconSets/Makefile.in
@@ -113,9 +113,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/IconSets/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/IconSets/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -147,6 +147,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/IconSets
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/IconSets/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WindowMaker/Icons/Makefile.in b/WindowMaker/Icons/Makefile.in
index 5541e999..c3913690 100755
--- a/WindowMaker/Icons/Makefile.in
+++ b/WindowMaker/Icons/Makefile.in
@@ -112,9 +112,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Icons/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Icons/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -146,6 +146,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/Icons
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Icons/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WindowMaker/Makefile.in b/WindowMaker/Makefile.in
index a91956c0..0965de86 100755
--- a/WindowMaker/Makefile.in
+++ b/WindowMaker/Makefile.in
@@ -114,9 +114,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -234,6 +234,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WindowMaker/Pixmaps/Makefile.in b/WindowMaker/Pixmaps/Makefile.in
index 65804543..2a5c78c1 100755
--- a/WindowMaker/Pixmaps/Makefile.in
+++ b/WindowMaker/Pixmaps/Makefile.in
@@ -112,9 +112,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Pixmaps/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Pixmaps/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -146,6 +146,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/Pixmaps
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Pixmaps/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WindowMaker/Styles/Makefile.in b/WindowMaker/Styles/Makefile.in
index da76f0b7..c391dbf0 100755
--- a/WindowMaker/Styles/Makefile.in
+++ b/WindowMaker/Styles/Makefile.in
@@ -112,9 +112,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Styles/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Styles/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -146,6 +146,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/Styles
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Styles/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WindowMaker/Themes/Makefile.in b/WindowMaker/Themes/Makefile.in
index 67c684d4..6b870d02 100755
--- a/WindowMaker/Themes/Makefile.in
+++ b/WindowMaker/Themes/Makefile.in
@@ -113,9 +113,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Themes/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Themes/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -233,6 +233,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/Themes
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Themes/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/acconfig.h b/acconfig.h
index 4d33fea7..edc59ef9 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -54,9 +54,6 @@
  * set by configure */
 #undef I18N
 
-/* Multi-byte (japanese, korean, chinese etc.) character support */
-#undef I18N_MB
-
 /* define if you want sound support */
 #undef WMSOUND
 
diff --git a/configure b/configure
index a2cab751..45ab9acd 100755
--- a/configure
+++ b/configure
@@ -754,7 +754,7 @@ fi
 
 PACKAGE=WindowMaker
 
-VERSION=0.54.0
+VERSION=0.60.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff --git a/configure.in b/configure.in
index 8758faf4..36424e73 100644
--- a/configure.in
+++ b/configure.in
@@ -246,20 +246,13 @@ done
 
 dnl Kanji Characters support
 dnl ========================
-I18n=no
-AC_ARG_ENABLE(kanji,
-[  --enable-kanji	  multibyte character support (kanji, Korean etc.)],,
-		enable_kanji=no)
 
-if test "$enable_kanji" = yes; then
-	case $host_os in
+case $host_os in
 	freebsd*)
 		AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"]);;
 	*)
-		;;
-	esac
-        AC_DEFINE(I18N_MB)
-fi
+	;;
+esac
 
 
 
@@ -334,6 +327,8 @@ dnl ===========================================
 
 AC_PATH_XTRA
 
+X_LIBRARY_PATH=$x_library
+
 XCFLAGS="$X_CFLAGS"
 
 XLFLAGS="$X_LIBS"
@@ -345,6 +340,10 @@ lib_search_path="$lib_search_path $XLFLAGS"
 inc_search_path="$inc_search_path $XCFLAGS"
 
 
+AC_SUBST(X_LIBRARY_PATH)
+
+
+
 dnl Decide which locale function to use, setlocale() or _Xsetlocale()
 dnl by MANOME Tomonori 
 dnl ===========================================
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index fab9ecba..06dfef1a 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -105,9 +105,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -120,6 +120,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = contrib
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu contrib/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 5b2df022..71bd5923 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -112,9 +112,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -166,6 +166,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = doc
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/po/Makefile.in b/po/Makefile.in
index 3c6d3658..fa980b18 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -123,9 +123,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .mo .po
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps po/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -138,6 +138,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = po
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu po/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \