diff --git a/configure.ac.in b/configure.ac.in
index 234cb116f22a0a6d95ddd9be64eaa51f63a9da94..e5eac3bfb582ee323941965b2fdbcc124e964f4a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -3,7 +3,7 @@ dnl
 dnl xfwm4 - window manager for the Xfce4 desktop environment
 dnl
 
-m4_define([xfwm4_version],[4.3.90.2])
+m4_define([xfwm4_version], [4.3.90.2])
 
 dnl init autoconf
 AC_COPYRIGHT([Copyright (c) 2002-2005
@@ -40,9 +40,9 @@ AC_CHECK_FUNCS([daemon setsid])
 AC_CHECK_FUNCS(opendir)
 
 dnl Check for i18n support
-XDT_I18N([ar az be bg bn_IN ca cs de el en_GB eo es es_MX et eu fa fi fr gu
-	  he hi hu it ja ko lt mr ms nb_NO nl pa pl pt_BR pt_PT ro ru sk
-	  sv ta tr uk vi zh_CN zh_TW])
+XDT_I18N([ar az be bg bn_IN ca cs de el en_GB eo es es_MX et eu fa fi fr gu \
+          he hi hu it ja ko lt mr ms nb_NO nl pa pl pt_BR pt_PT ro ru sk \
+          sv ta tr uk vi zh_CN zh_TW])
 
 dnl Check for X11 window system
 XDT_CHECK_LIBX11_REQUIRE
@@ -57,23 +57,26 @@ AC_CHECK_LIB([Xext], [XShapeCombineShape],
   ], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS])
 
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
-XDT_CHECK_PACKAGE(LIBXFCE4MCS_CLIENT, libxfce4mcs-client-1.0, [4.2.0])
-XDT_CHECK_PACKAGE(LIBXFCE4MCS_MANAGER, libxfce4mcs-manager-1.0, [4.2.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.2.0])
+XDT_CHECK_PACKAGE(LIBXFCE4MCS_CLIENT, libxfce4mcs-client-1.0, [4.3.90.1])
+XDT_CHECK_PACKAGE(LIBXFCE4MCS_MANAGER, libxfce4mcs-manager-1.0, [4.3.90.1])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
 XDT_CHECK_PACKAGE(LIBXFCEGUI4, libxfcegui4-1.0, [4.3.90.2])
-XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [4.2.0])
+XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [4.3.90.2])
 
 dnl
 dnl Startup notification support
 dnl
+LIBSTARTUP_NOTIFICATION_FOUND="no"
 XDT_CHECK_OPTIONAL_PACKAGE([LIBSTARTUP_NOTIFICATION],
-			   [libstartup-notification-1.0], [0.5],
-			   [startup-notification], 
-			   [startup notification library], [yes])
+                       [libstartup-notification-1.0], [0.5],
+                       [startup-notification], 
+                       [startup notification library], [yes])
+
 
 dnl
 dnl Render support
 dnl
+have_render="no"
 if $PKG_CONFIG --print-errors --exists xrender 2> /dev/null; then
   PKG_CHECK_MODULES(RENDER, xrender)
   have_render="yes"
@@ -89,14 +92,14 @@ AC_HELP_STRING([--enable-randr], [try to use the randr extension])
 AC_HELP_STRING([--disable-randr], [don't try to use the randr extension]),
   [], [enable_randr=yes])
 RANDR_LIBS=
-have_xrandr="false"
+have_xrandr="no"
 if test x"$enable_randr" = x"yes"; then
   if test x"$have_render" = x"yes"; then
     have_xrandr="no"
     ac_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $LIBX11_CFLAGS"
     AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
-        	 [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
+                 [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
                                   RANDR_LIBS="-lXrandr -lXrender"
                                   AC_DEFINE([HAVE_RANDR], [1], [Define to enable xrandr])
                                   have_xrandr="yes",,
@@ -130,14 +133,13 @@ fi
 AC_SUBST(ENABLE_COMPOSITOR)
 
 dnl Check for debugging support
-BM_DEBUG_SUPPORT
+XDT_FEATURE_DEBUG
 
 REVISION=@REVISION@
 AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [svn revision number])
 AC_SUBST([REVISION])
 
 AC_OUTPUT([ 
-xfwm4.spec
 Makefile
 doc/Makefile
 doc/C/Makefile
@@ -164,6 +166,7 @@ themes/stoneage/Makefile
 themes/therapy/Makefile
 themes/tyrex/Makefile
 themes/wallis/Makefile
+xfwm4.spec
 ])
 
 echo