diff --git a/ChangeLog b/ChangeLog
index 4735c73e8..e9875c9b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-05-24  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+	* cherokee/Makefile.am (INCLUDES), cget/Makefile.am: Added a new
+	-I entry for the C compiler. It was needed to allow to work in a
+	VPATH environment.
+
+	* doc/build_docs.py (main), doc/Makefile.am: A few path management
+	issues have been fixed.  There were a couple of VPATH compiling
+	issues because of this problem.
+
 2008-05-23  Alvaro Lopez Ortega  <alvaro@alobbs.com>
 
 	* cherokee/Makefile.am (libplugin_server_info_la_LIBADD): This
diff --git a/cget/Makefile.am b/cget/Makefile.am
index 581f5217b..46390607f 100644
--- a/cget/Makefile.am
+++ b/cget/Makefile.am
@@ -1,6 +1,7 @@
 ## Cherokee: src/cget/Makefile.am  -*- makefile -*-
 
 INCLUDES = -I. \
+-I${top_srcdir} \
 -I${top_srcdir}/cherokee \
 $(TLS_CFLAGS) \
 $(PTHREAD_CFLAGS) \
diff --git a/cherokee/Makefile.am b/cherokee/Makefile.am
index de9c30d2e..bb5e37f48 100644
--- a/cherokee/Makefile.am
+++ b/cherokee/Makefile.am
@@ -1,6 +1,7 @@
 ## Cherokee: cherokee/Makefile.am  -*- makefile -*-
 
 INCLUDES = \
+-I${top_srcdir} \
 $(TLS_CFLAGS) \
 $(PTHREAD_CFLAGS)
 
diff --git a/configure.in b/configure.in
index 696b75435..9f91f83db 100644
--- a/configure.in
+++ b/configure.in
@@ -1205,8 +1205,10 @@ for mod in $modules; do
 	fi
 done
 
+AC_MSG_CHECKING([loader.autoconf files])
 printf "$ext_defs\n"                                 > ${srcdir}/cherokee/loader.autoconf.h
 printf "$headers \n\n $add_calls \n\n $init_calls\n" > ${srcdir}/cherokee/loader.autoconf.inc
+AC_MSG_RESULT([done])
 
 dnl
 dnl Static/Dynamic modules
@@ -1242,7 +1244,7 @@ AM_CONDITIONAL(STATIC_RULE_DIRECTORY,         grep directory      $conf_h >/dev/
 AM_CONDITIONAL(STATIC_RULE_EXTENSIONS,        grep extensions     $conf_h >/dev/null)
 AM_CONDITIONAL(STATIC_RULE_REQUEST,           grep request        $conf_h >/dev/null)
 AM_CONDITIONAL(STATIC_RULE_HEADER,            grep header         $conf_h >/dev/null)
-# These must the at the end
+# These must be at the end
 AM_CONDITIONAL(STATIC_RULE_NOT,               grep _not_          $conf_h >/dev/null)
 AM_CONDITIONAL(STATIC_RULE_AND,               grep _and_          $conf_h >/dev/null)
 AM_CONDITIONAL(STATIC_RULE_OR,                grep _or_           $conf_h >/dev/null)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 365b9067e..d77fa547a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -100,4 +100,4 @@ $(GENERATED_FILES)
 
 .NOTPARALLEL: $(GENERATED_FILES)
 $(GENERATED_FILES):
-	python build_docs.py -v
+	python $(top_srcdir)/doc/build_docs.py -v
diff --git a/doc/build_docs.py b/doc/build_docs.py
index 9c23d7393..5041726f6 100644
--- a/doc/build_docs.py
+++ b/doc/build_docs.py
@@ -67,7 +67,7 @@ def depart_block_quote(self, node):
     return publish_parts(text, writer=CherokeeHTMLWriter())
 
 def main():
-    output_dir = '.'
+    output_dir = './'
     
     #
     # Check parameters
@@ -75,8 +75,9 @@ def main():
     verbose = False
     if '-v' in sys.argv:
         verbose = True
-        sys.argv.remove('-v')
-    
+        sys.argv.remove('-v')    
+
+    prefix = os.path.dirname(sys.argv[0])
 
     #
     # get the language to compile
@@ -87,7 +88,7 @@ def main():
         except IndexError:
             lang = 'en'
     finally:
-        lang_dir = 'locale/%s/' % lang
+        lang_dir = os.path.join (prefix, 'locale', lang)
         if not os.path.exists(lang_dir):
             print ('language %s does not exist.' % lang)
             raise SystemExit
@@ -100,7 +101,8 @@ def main():
         'TEMPLATE_DEBUG': False,
         'TEMPLATE_LOADERS':
             ('django.template.loaders.filesystem.load_template_source',),
-        'TEMPLATE_DIRS': ('templates/',)
+        'TEMPLATE_DIRS': 
+            (os.path.join (prefix, 'templates'),)
     })
     
     doc_detail_template = get_template('doc_detail.html')
@@ -139,7 +141,7 @@ def main():
             else:
                 parts = {'title': 'Unknown', 'body': 'No docutils found.'}
             
-            write_dir = os.path.join(output_dir, d.replace(lang_dir, ''))
+            write_dir = os.path.normpath (output_dir + d.replace(lang_dir, ''))
             
             if not os.path.exists(write_dir):
                 os.mkdir(write_dir)