diff --git configure.ac configure.ac
index e165b12..ca883a5 100644
--- configure.ac
+++ configure.ac
@@ -1,4 +1,4 @@
-# Process this file with autoconf to produce a configure script.
+dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
 m4_define([eex_version], [2.29.1])
@@ -7,7 +7,7 @@ AC_INIT(evolution-exchange, [eex_version], http://bugzilla.gnome.org/enter_bug.c
 AC_CONFIG_SRCDIR(storage)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
-# Required Package Versions
+dnl Required Package Versions
 m4_define([glib_minimum_version], [2.16.0])
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([eds_minimum_version], [eex_version])
@@ -20,7 +20,7 @@ m4_define([libsoup_minimum_version], [2.3.0])
 
 AM_CONFIG_HEADER(config.h)
 
-# Automake 1.11 - Silent Build Rules
+dnl Automake 1.11 - Silent Build Rules
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_ARG_WITH(e2k-debug,     [  --with-e2k-debug              Allow debugging])
@@ -38,6 +38,9 @@ EVOLUTION_API_VERSION=2.30
 EDS_API_VERSION=1.2
 EDS_BASE_VERSION=2.30
 
+dnl ***************************************
+dnl Check for evo/eds and version setting
+dnl ***************************************
 AC_MSG_CHECKING(Evolution version)
 EVOLUTION_VERSION=`pkg-config --modversion evolution-shell 2>/dev/null`
 if test -z "$EVOLUTION_VERSION"; then
@@ -58,7 +61,9 @@ AC_DEFINE_UNQUOTED(API_VERSION, "$API_VERSION", Eds api version)
 AC_SUBST(API_VERSION)
 AC_SUBST(EDS_BASE_VERSION)
 
+dnl ******************************
 dnl Initialize maintainer mode
+dnl ******************************
 AM_MAINTAINER_MODE
 
 AC_ISC_POSIX
@@ -68,11 +73,14 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
+dnl ******************************
 dnl Initialize libtool
+dnl ******************************
 AM_PROG_LIBTOOL
 
-# Compiler Warning Flags
-
+dnl ******************************
+dnl Compiler Warning Flags
+dnl ******************************
 AS_COMPILER_FLAGS(WARNING_FLAGS,
 	"-DG_DISABLE_DEPRECATED
 	-DPANGO_DISABLE_DEPRECATED
@@ -93,18 +101,17 @@ AS_COMPILER_FLAGS(WARNING_FLAGS,
 	-Wredundant-decls -Wundef -Wwrite-strings")
 AC_SUBST(WARNING_FLAGS)
 
-# Other useful compiler warnings for test builds only.
-# These may produce warnings we have no control over.
-#
-#	-Wmissing-format-attribute
-#	-Wshadow
+dnl Other useful compiler warnings for test builds only.
+dnl These may produce warnings we have no control over.
+dnl
+dnl	-Wmissing-format-attribute
+dnl	-Wshadow
 
 CFLAGS="$CFLAGS $WARNING_FLAGS"
 
-dnl ****
-dnl i18n
-dnl ****
-
+dnl ******************************
+dnl I18N stuff
+dnl ******************************
 IT_PROG_INTLTOOL([0.35.5])
 AM_GLIB_GNU_GETTEXT
 
@@ -118,7 +125,6 @@ AC_SUBST(localedir)
 dnl ******************************
 dnl Check for Win32
 dnl ******************************
-
 AC_MSG_CHECKING([for Win32])
 case "$host" in
 *-mingw*)
@@ -136,7 +142,9 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
 AC_SUBST(NO_UNDEFINED)
 AC_SUBST(SOCKET_LIBS)
 
-# Check for base dependencies early.
+dnl ***********************************
+dnl Check for base dependencies early.
+dnl ***********************************
 PKG_CHECK_MODULES(GNOME_PLATFORM,
 	[glib-2.0 >= glib_minimum_version
 	 gtk+-2.0 >= gtk_minimum_version
@@ -159,7 +167,6 @@ PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER,
 dnl *************************
 dnl CFLAGS and LIBS and stuff
 dnl *************************
-
 GNOME_COMPILE_WARNINGS(maximum)
 CFLAGS="$CFLAGS $WARN_CFLAGS"
 case $CFLAGS in
@@ -178,15 +185,23 @@ dnl AC_DEFINE(LIBGLADE_DISABLE_DEPRECATED,1,[No deprecated libglade functions])
 
 AC_EGREP_HEADER(socklen_t, sys/socket.h, :, AC_DEFINE(socklen_t, int, [Define to "int" if socklen_t is not defined]))
 
+dnl ******************************
+dnl GObject marshalling
+dnl ******************************
 AM_PATH_GLIB_2_0
-AM_PATH_ORBIT2
+
+dnl ******************************
+dnl GConf stuff
+dnl ******************************
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
 AM_GCONF_SOURCE_2
 
 CONNECTOR_DATADIR='$(datadir)/evolution-exchange/$(BASE_VERSION)'
 AC_SUBST(CONNECTOR_DATADIR)
 
-dnl Check that e-d-s was built with Exchange support.
+dnl **************************************************
+dnl Check that eds was built with Exchange support.
+dnl **************************************************
 EXCHANGE_PACKAGE="`pkg-config --exists libexchange-storage-$EDS_API_VERSION`"
 if test "x$EXCHANGE_PACKAGE" != "x"; then
 	echo "
@@ -197,12 +212,24 @@ if test "x$EXCHANGE_PACKAGE" != "x"; then
 	exit 1
 fi
 
+dnl *************************
+dnl Orbit / Bonobo
+dnl *************************
+AM_PATH_ORBIT2
 EVOLUTION_idldir="`pkg-config --variable=idldir evolution-shell`"
 AC_SUBST(EVOLUTION_idldir)
 
 EVOLUTION_IDL_INCLUDES="`pkg-config --variable=IDL_INCLUDES evolution-shell`"
 AC_SUBST(EVOLUTION_IDL_INCLUDES)
 
+dnl ******************************
+dnl Special directories
+dnl ******************************
+
+dnl If you add something here, consider whether or not you also
+dnl need to add it to one or more .pc.in files (for Connector,
+dnl etc)
+
 EVOLUTION_privlibdir="`pkg-config --variable=privlibdir evolution-shell`"
 AC_SUBST(EVOLUTION_privlibdir)
 
@@ -218,24 +245,41 @@ AC_SUBST(EVOLUTION_imagesdir)
 CAMEL_providerdir="`pkg-config --variable=camel_providerdir camel-provider-$EDS_API_VERSION`"
 AC_SUBST(CAMEL_providerdir)
 
-
+dnl ******************************
+dnl libedata-book check
+dnl ******************************
 PKG_CHECK_MODULES(ADDRESSBOOK, libedata-book-$EDS_API_VERSION camel-provider-$EDS_API_VERSION)
 AC_SUBST(ADDRESSBOOK_CFLAGS)
 
+dnl ******************************
+dnl libedata-cal check
+dnl ******************************
 PKG_CHECK_MODULES(CALENDAR, libedata-cal-$EDS_API_VERSION)
 AC_SUBST(CALENDAR_CFLAGS)
 AC_SUBST(CALENDAR_LIBS)
 
+dnl ******************************
+dnl camel check
+dnl ******************************
 PKG_CHECK_MODULES(CAMEL, camel-provider-$EDS_API_VERSION)
 AC_SUBST(CAMEL_CFLAGS)
 
+dnl ******************************
+dnl libecal check
+dnl ******************************
 PKG_CHECK_MODULES(MAIL, libecal-$EDS_API_VERSION)
 AC_SUBST(MAIL_CFLAGS)
 
+dnl ***********************************
+dnl Check for exchange storage support
+dnl ***********************************
 PKG_CHECK_MODULES(EXCHANGE_STORAGE, evolution-shell evolution-plugin libedataserverui-$EDS_API_VERSION libedata-book-$EDS_API_VERSION libedata-cal-$EDS_API_VERSION libsoup-2.4 libglade-2.0 camel-provider-$EDS_API_VERSION)
 AC_SUBST(EXCHANGE_STORAGE_CFLAGS)
 AC_SUBST(EXCHANGE_STORAGE_LIBS)
 
+dnl ***********************************
+dnl Check for libexchange
+dnl ***********************************
 PKG_CHECK_MODULES(LIBEXCHANGE, libsoup-2.4 evolution-shell libedataserverui-$EDS_API_VERSION libebackend-$EDS_API_VERSION libexchange-storage-$EDS_API_VERSION)
 AC_SUBST(LIBEXCHANGE_CFLAGS)
 AC_SUBST(LIBEXCHANGE_LIBS)
@@ -243,11 +287,11 @@ AC_SUBST(LIBEXCHANGE_LIBS)
 dnl *********************
 dnl Pilot license support
 dnl *********************
-# This does not take leap years into account, but that's not
-# important: having the build time be slightly too early is good
-# to support slight clock skew anyway.
-# 946684800 is 2000-01-01T00:00:00Z.
-# Don't change this without testing under /bin/sh on Solaris.
+dnl This does not take leap years into account, but that's not
+dnl important: having the build time be slightly too early is good
+dnl to support slight clock skew anyway.
+dnl 946684800 is 2000-01-01T00:00:00Z.
+dnl Don't change this without testing under /bin/sh on Solaris.
 abt=`eval expr \`date '+\( \( %y \* 365 \) + %j - 1 \) \* 24 \* 60 \* 60 + 946684800'\``
 case $abt in
 "")
@@ -290,14 +334,15 @@ LIBS="$LIBS $LDAP_LIBS"
 AC_CHECK_FUNCS(ldap_ntlm_bind)
 CFLAGS="$SAVE_CFLAGS"
 LIBS="$SAVE_LIBS"
-else # Win32
+dnl Win32 support
+else
 LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED"
 LDAP_LIBS="-lwldap32"
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
 AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
 AM_CONDITIONAL(ENABLE_LDAP, true)
-fi # Win32
+fi
 
 AM_CONDITIONAL(SUNLDAP, test "$with_sunldap" != no)
 
@@ -331,9 +376,8 @@ dnl into the top level where I don't want it.
  GTK_DOC_CHECK([1.0])
 
 dnl **************************************************
-dnl * libdb checking - taken from EDS
+dnl libdb checking - taken from EDS
 dnl **************************************************
-
 AC_ARG_WITH(libdb, AC_HELP_STRING([--with-libdb],[Prefix where libdb is installed]), dynamic_libdb=yes, dynamic_libdb=no)
 if test "x${dynamic_libdb}" = "xyes"; then
         DB_CFLAGS="-I$withval/include"
@@ -368,11 +412,9 @@ LIBS=$save_libs
 AC_SUBST(DB_CFLAGS)
 AC_SUBST(DB_LIBS)
 
-
 dnl ******************************
 dnl Makefiles
 dnl ******************************
-
 AC_OUTPUT([
 Makefile
 evolution-exchange-zip
