--- a/documentation/change_history.pod	Thu Jul 29 12:05:54 2010 +1000
+++ b/documentation/change_history.pod	Thu Jul 29 12:58:05 2010 +1000
@@ -16,8 +16,18 @@
 
 =head2 Release 000.4
 
+=over 5
+
+=item *
+
 Fixed a defect in iosrv.exe that caused a panic if a foreground read object was attached to a different end point. This was due to the read object being notified of a change in foreground before its iEndPoint member was updated. This member is now updated before attempting the attach, and is set to NULL in the event of a leave (resulting in the read object being left in an unattached state).
 
+=item *
+
+More build fixes. Changed the documentation builder to automatically prepend C<%EPOCROOT%> (converted to a path relative form) to pre-processor include path options that start with F<epoc32>. Prevously C<$(EPOCROOT)> was prepended in the makefile, which broke the documentation build because the pre-processor will only accecpt relative path include options.
+
+=back
+
 =head2 Release 000.3
 
 Build fixes.

--- a/documentation/fshell_builddocs.mk	Thu Jul 29 12:05:54 2010 +1000
+++ b/documentation/fshell_builddocs.mk	Thu Jul 29 12:58:05 2010 +1000
@@ -10,12 +10,12 @@
 # Accenture - Initial contribution
 #
 BLD :
-	..\tools\fsh-builddocs -i $(EPOCROOT)epoc32/include pod-list.txt
+	..\tools\fsh-builddocs -i epoc32/include pod-list.txt
 
 RELEASABLES :
-	..\tools\fsh-builddocs -i $(EPOCROOT)epoc32/include pod-list.txt -w
+	..\tools\fsh-builddocs -i epoc32/include pod-list.txt -w
 
 CLEAN :
-	..\tools\fsh-builddocs -i $(EPOCROOT)epoc32/include pod-list.txt -c
+	..\tools\fsh-builddocs -i epoc32/include pod-list.txt -c
 
 MAKMAKE FREEZE LIB CLEANLIB RESOURCE SAVESPACE FINAL : 

--- a/tools/fsh-builddocs	Thu Jul 29 12:05:54 2010 +1000
+++ b/tools/fsh-builddocs	Thu Jul 29 12:58:05 2010 +1000
@@ -1,12 +1,12 @@
 #!perl
 # fsh-builddocs
-# 
+#
 # Copyright (c) 2010 Accenture. All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of the "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
-# 
+#
 # Initial Contributors:
 # Accenture - Initial contribution
 
@@ -83,6 +83,15 @@
 	     'i|include=s' => $options{includes}) or DisplayHelp();
   DisplayHelp() if ($help);
   warn "Invalid arguments\n" and DisplayHelp() unless (@ARGV == 1);
+
+  my $relativeEpocRootPath = fshu::RelativePath($ENV{EPOCROOT}, cwd());
+  $relativeEpocRootPath =~ s/\\/\//g; # '\' -> '/'.
+  foreach my $include (@{$options{includes}}) {
+    if ($include =~ /^epoc32/i) {
+      $include = "${relativeEpocRootPath}$include";
+    }
+  }
+
   return shift @ARGV;
 }
 
@@ -104,7 +113,7 @@
   my $spec;
 
   my $currentDir;
-  my $currentFile;
+  my $currentFile = $podListFileName;
   my $currentLine = 0;
   while (my $line = <CPP>) {
     ++$currentLine;