diff --git a/build.xml b/build.xml
index 285f02e..e417cd3 100644
--- a/build.xml
+++ b/build.xml
@@ -568,8 +568,9 @@
         &libsets;
         <project type="${project.type}" outfile="${projects.dir}/${lib.name}" if="project.if">
          <comment>&license;</comment>
-            <dependency file="${projects.dir}/apr-1"/>
-            <dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
+            <dependency file="${projects.dir}/apr"/>
+            <dependency file="${projects.dir}/xml"/>
+            <dependency file="${projects.dir}/aprutil" depends="apr,xml"/>
             <dependency name="${projects.dir}/libesmtp"/>
         </project>
     </cc>
@@ -618,10 +619,11 @@
 
         <project outfile="${projects.dir}/${example.name}" type="${project.type}" if="project.if">
          <comment>&license;</comment>
-            <dependency file="${projects.dir}/apr-1"/>
-            <dependency name="${projects.dir}/aprutil-1"/>
+            <dependency file="${projects.dir}/apr"/>
+            <dependency file="${projects.dir}/xml"/>
+            <dependency name="${projects.dir}/aprutil" depends="apr,xml"/>
             <dependency name="${projects.dir}/libesmtp"/>
-            <dependency file="${projects.dir}/log4cxx" depends="apr-1,aprutil-1"/>
+            <dependency file="${projects.dir}/log4cxx" depends="apr,aprutil,xml"/>
         </project>
         
     </cc>
@@ -713,10 +715,11 @@
 
         <project outfile="${projects.dir}/testsuite" type="${project.type}" if="project.if">
          <comment>&license;</comment>
-            <dependency file="${projects.dir}/apr-1"/>
-            <dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
+            <dependency file="${projects.dir}/apr"/>
+            <dependency file="${projects.dir}/xml"/>
+            <dependency file="${projects.dir}/aprutil" depends="apr,xml"/>
             <dependency name="${projects.dir}/libesmtp"/>
-            <dependency file="${projects.dir}/log4cxx" depends="apr-1,aprutil-1,libesmtp"/>
+            <dependency file="${projects.dir}/log4cxx" depends="apr,aprutil,libesmtp"/>
         </project>
     </cc>
 </target>
@@ -774,8 +777,9 @@
                  type="${project.type}"
                  if="project.if">
          <comment>&license;</comment>
-            <dependency file="${projects.dir}/apr-1"/>
-            <dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
+            <dependency file="${projects.dir}/apr"/>
+            <dependency file="${projects.dir}/xml"/>
+            <dependency file="${projects.dir}/aprutil" depends="apr,xml"/>
             <dependency name="${projects.dir}/libesmtp"/>
         </project>
     </cc>
@@ -1093,19 +1097,35 @@
     <antcall target="build-projects-vc6">
         <param name="find" value="false"/>
     </antcall>
-    <antcall target="build-projects-xcode"/>
+    <antcall target="build-projects-xcode">
+    </antcall>
     <taskdef name="foreach" classname="net.sf.antcontrib.logic.ForEach" />
     
-    <replaceregexp flags="i"
+    <replaceregexp flags="ig"
         match="ADD LINK32 .*/NOLOGO"
         replace="ADD LINK32 ADVAPI32.LIB WS2_32.LIB MSWSOCK.LIB SHELL32.LIB ODBC32.LIB /NOLOGO">
         <fileset dir="${target.dir}" includes="**/*.dsp"/>        
     </replaceregexp>
     <replaceregexp flags="g"
-        match=".\\apr(.*)-1.dsp"
-        replace="..\\\\..\\\\apr\1\\\\apr\1.dsp">
+        match=".\\apr.dsp"
+        replace="..\\\\..\\\\apr\\\\apr.dsp">
         <fileset dir="${target.dir}" includes="**/*.dsw"/>        
     </replaceregexp>
+    <replaceregexp flags="g"
+        match=".\\aprutil.dsp"
+        replace="..\\\\..\\\\apr-util\\\\aprutil.dsp">
+        <fileset dir="${target.dir}" includes="**/*.dsw"/>        
+    </replaceregexp>
+    <replaceregexp flags="g"
+        match=".\\xml.dsp"
+        replace="..\\\\..\\\\apr-util\\\\xml\\\\expat\\\\lib\\\\xml.dsp">
+        <fileset dir="${target.dir}" includes="**/*.dsw"/>        
+    </replaceregexp>
+    <!-- drop our build path out of library search path -->
+    <replace dir="${target.dir}" includes="**/*.pbxproj">
+        <replacetoken>&lt;string&gt;debug/shared&lt;/string&gt;</replacetoken>
+        <replacevalue></replacevalue>
+    </replace>
     <replace dir="${target.dir}/site" includes="**/*.html">
         <replacetoken>&lt;html</replacetoken>
         <replacevalue>&lt;!--
diff --git a/configure-aprutil.bat b/configure-aprutil.bat
new file mode 100755
index 0000000..576c22e
--- /dev/null
+++ b/configure-aprutil.bat
@@ -0,0 +1,20 @@
+ECHO OFF
+REM  Licensed to the Apache Software Foundation (ASF) under one or more
+REM  contributor license agreements.  See the NOTICE file distributed with
+REM  this work for additional information regarding copyright ownership.
+REM  The ASF licenses this file to You under the Apache License, Version 2.0
+REM  (the "License"); you may not use this file except in compliance with
+REM  the License.  You may obtain a copy of the License at
+REM 
+REM       http://www.apache.org/licenses/LICENSE-2.0
+REM 
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+REM 
+REM 
+sed -i -e "s/#define APU_HAVE_APR_ICONV\b.*/#define APU_HAVE_APR_ICONV 0/" ..\apr-util\include\apu.hw
+sed -i -e "s/#define APR_HAS_LDAP\b.*/#define APR_HAS_LDAP 0/" ..\apr-util\include\apr_ldap.hw
+
diff --git a/configure.bat b/configure.bat
new file mode 100644
index 0000000..1021514
--- /dev/null
+++ b/configure.bat
@@ -0,0 +1,19 @@
+ECHO OFF
+REM  Licensed to the Apache Software Foundation (ASF) under one or more
+REM  contributor license agreements.  See the NOTICE file distributed with
+REM  this work for additional information regarding copyright ownership.
+REM  The ASF licenses this file to You under the Apache License, Version 2.0
+REM  (the "License"); you may not use this file except in compliance with
+REM  the License.  You may obtain a copy of the License at
+REM 
+REM       http://www.apache.org/licenses/LICENSE-2.0
+REM 
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+REM 
+REM 
+copy /Y src\main\include\log4cxx\log4cxx.hw src\main\include\log4cxx\log4cxx.h
+copy /Y src\main\include\log4cxx\private\log4cxx_private.hw src\main\include\log4cxx\private\log4cxx_private.h
diff --git a/src/ant/apr-build.xml b/src/ant/apr-build.xml
index 5a52617..fff625d 100755
--- a/src/ant/apr-build.xml
+++ b/src/ant/apr-build.xml
@@ -150,7 +150,7 @@
         <libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
         <libset libs="pthread dl" if="is-unix"/>
         <libset libs="cw32mt" if="is-bcc"/>
-        <project type="${project.type}" outfile="${projects.dir}/apr-1" if="project.if">
+        <project type="${project.type}" outfile="${projects.dir}/apr" if="project.if">
 			<comment>&license;</comment>
 		</project>
 
@@ -185,7 +185,7 @@
         <libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
         <project type="${project.type}" outfile="${projects.dir}/${test}" if="project.if">
 			<comment>&license;</comment>
-			<dependency file="${projects.dir}/apr-1"/>
+			<dependency file="${projects.dir}/apr"/>
 		</project>
     </cc>
 </target>
diff --git a/src/ant/apr-util-build.xml b/src/ant/apr-util-build.xml
index 694279f..b4e4e92 100755
--- a/src/ant/apr-util-build.xml
+++ b/src/ant/apr-util-build.xml
@@ -127,8 +127,7 @@
 </target>
 
 
-<target name="build" depends="configure, find-apr" description="Build library">
-    <mkdir dir="${executable.dir}/apr-util-ofiles"/>
+<target name="build-xml" depends="configure" description="Builds Expat">
     <!--   uses replace instead of preprocessor since
               the quotes on VERSION cause problems with cpptasks  -->
     <replace file="${src.dir}/xml/expat/lib/xmlparse.c">
@@ -137,11 +136,47 @@
        <replacefilter token="XML_MICRO_VERSION" value="1"/>
        <replacefilter token="VERSION" value='"expat_1.95.1"'/>
     </replace>
+
+    <mkdir dir="${executable.dir}/apr-util-ofiles"/>
+    <property name="project.compiler" value="${compiler}"/>
+	<property name="project.type" value="msvc6"/>
+    
+    <!--   this only generate a project file necessary to mimic
+              this visual studio project provided with APR -->
+    <cc name="${project.compiler}"
+        outfile="${executable.dir}/expat"
+        subsystem="console"
+        multithreaded="true"
+        outtype="static"
+        objdir="${executable.dir}/apr-util-ofiles"
+        warnings="none"
+        debug="${debug}"
+        projectsOnly="true">
+        <fileset dir="${src.dir}/xml/expat/lib"
+            includes="xmlparse.c xmlrole.c xmltok.c"/>
+        <fileset dir="${src.dir}/xml/expat/lib" includes="*.h"/>
+        <fileset dir="${src.dir}/xml/expat" includes="*.h"/>
+        <includepath path="${src.dir}/xml/expat/lib"/>
+        <includepath path="${src.dir}/xml/expat"/>
+        <defineset>
+            <define name="XMLPARSEAPI" value=" "/>
+        </defineset>
+        <defineset define="WIN32" if="is-windows"/>
+        <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/>
+        <compilerarg value="${pic-option}" if="pic-option"/>
+
+        <libset libs="cw32mt" if="is-bcc"/>
+        <project type="${project.type}" outfile="${projects.dir}/xml" if="project.if">
+			<comment>&license;</comment>
+        </project>
+    </cc>
+
+</target>
+
+<target name="build" depends="build-xml, find-apr" description="Build library">
 	<property name="apr.lib.prefix" value=""/>
 	<property name="apr.lib.name" value="apr-1"/>
 	<property name="apr.lib.suffix" value=""/>
-    <property name="project.compiler" value="${compiler}"/>
-	<property name="project.type" value="msvc6"/>
     <cc name="${project.compiler}"
         outfile="${executable.dir}/aprutil-1${lib-suffix}"
         subsystem="console"
@@ -155,10 +190,10 @@
             excludes="test/*.c ldap/*.c xml/expat/lib/*"/>
         <fileset dir="${src.dir}/xml/expat/lib"
             includes="xmlparse.c xmlrole.c xmltok.c"/>
-        <fileset dir="${include.dir}" includes="*.h"/>
-        <fileset dir="${include.dir}/private" includes="*.h"/>
         <fileset dir="${src.dir}/xml/expat/lib" includes="*.h"/>
         <fileset dir="${src.dir}/xml/expat" includes="*.h"/>
+        <fileset dir="${include.dir}" includes="*.h"/>
+        <fileset dir="${include.dir}/private" includes="*.h"/>
         <includepath path="${apr.include.dir}"/>
         <includepath path="${include.dir}"/>
         <includepath path="${include.dir}/private"/>
@@ -174,7 +209,7 @@
         <defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/>
         <compilerarg value="${pic-option}" if="pic-option"/>
 
-        <libset dir="${executable.dir}" libs="${apr.lib.prefix}${apr.lib.name}${apr.lib.suffix}"/>
+        <libset dir="${executable.dir}" libs="xml ${apr.lib.prefix}${apr.lib.name}${apr.lib.suffix}"/>
         <libset libs="cw32mt" if="is-bcc"/>
         <libset libs="pthread dl" if="is-unix"/>
         <libset libs="iconv" if="has-iconv"/>
@@ -182,9 +217,9 @@
         <defineset if="is-bcc">
             <define name="EILSEQ" value="50"/>
         </defineset>
-        <project type="${project.type}" outfile="${projects.dir}/aprutil-1" if="project.if">
+        <project type="${project.type}" outfile="${projects.dir}/aprutil" if="project.if">
 			<comment>&license;</comment>
-            <dependency file="${projects.dir}/apr-1"/>
+            <dependency file="${projects.dir}/apr"/>
         </project>
     </cc>
     <property name="apr.lib.dir" location="${executable.dir}"/>
@@ -221,8 +256,8 @@
         <libset libs="sqlite3" if="has-sqlite3"/>
         <project type="${project.type}" outfile="${projects.dir}/${test}" if="project.if">
 			<comment>&license;</comment>
-            <dependency file="${projects.dir}/apr-1"/>
-            <dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
+            <dependency file="${projects.dir}/apr"/>
+            <dependency file="${projects.dir}/aprutil" depends="apr"/>
         </project>
     </cc>
 </target>
diff --git a/src/ant/common.xml b/src/ant/common.xml
index 3723931..f9b76e3 100644
--- a/src/ant/common.xml
+++ b/src/ant/common.xml
@@ -17,7 +17,7 @@
 -->
 
 <property file="build.properties"/>
-<property name="debug" value="false"/>
+<property name="debug" value="true"/>
 <property name="rtti" value="false"/>
 <property name="optimize" value="none"/>
 <property name="lib.type" value="shared"/>
@@ -57,18 +57,18 @@
            <equals arg1="${compiler}" arg2="bcc"/>
         </or>
     </condition>
-
-    <condition property="is-msvc" value="true">
-        <or>
-           <equals arg1="${compiler}" arg2="msvc"/>
-        </or>
-    </condition>
+
+    <condition property="is-msvc" value="true">
+        <or>
+           <equals arg1="${compiler}" arg2="msvc"/>
+        </or>
+    </condition>
 
     <condition property="is-mingw" value="true">
-        <or>
-            <equals arg1="${compiler}" arg2="gcc"/>
-            <equals arg1="${compiler}" arg2="g++"/>
-        </or>
+        <or>
+            <equals arg1="${compiler}" arg2="gcc"/>
+            <equals arg1="${compiler}" arg2="g++"/>
+        </or>
     </condition>
 </target>
 
diff --git a/src/assembly/source.xml b/src/assembly/source.xml
index 3ade71d..174526f 100644
--- a/src/assembly/source.xml
+++ b/src/assembly/source.xml
@@ -24,6 +24,15 @@
 	<baseDirectory>apache-log4cxx-${project.version}</baseDirectory>
 	<includeSiteDirectory>true</includeSiteDirectory>
 	<fileSets>
+        <!-- autogen.sh is executable -->
+		<fileSet>
+			<includes>
+               <include>autogen.sh</include>
+               <include>configure.bat</include>
+               <include>configure-aprutil.bat</include>
+           </includes>
+            <fileMode>0755</fileMode>
+        </fileSet>
 		<fileSet>
 			<includes>
 				<include>INSTALL</include>
@@ -31,8 +40,7 @@
 				<include>LICENSE</include>
                <include>Makefile.am</include>
 				<include>NOTICE</include>
-               <include>autogen.sh</include>
-				<include>build.xml</include>
+ 				<include>build.xml</include>
                <include>configure.in</include>
                <include>find_apr.m4</include>
                <include>find_apu.m4</include>
@@ -67,12 +75,17 @@
 		</fileSet>
         <fileSet>
             <directory>target</directory>
+            <lineEnding>keep</lineEnding>
             <outputDirectory>projects</outputDirectory>
             <includes>
-            <include>*.dsw</include>
-            <include>*.dsp</include>
-            <include>*.xcodeproj/project.pbxproj</include>
+                <include>*.dsw</include>
+                <include>*.dsp</include>
+                <include>*.xcodeproj/project.pbxproj</include>
             </includes>
+            <excludes>
+                <exclude>apr*.ds*</exclude>
+                <exclude>xml.ds*</exclude>
+            </excludes>
         </fileSet>
 	</fileSets>
 </assembly>
diff --git a/src/site/apt/building/ant.apt b/src/site/apt/building/ant.apt
index 2c13ee8..d542a11 100644
--- a/src/site/apt/building/ant.apt
+++ b/src/site/apt/building/ant.apt
@@ -35,9 +35,8 @@
   *Install cpptasks 1.0b5 or later from the {{{http://ant-contrib.sourceforge.net}Ant-Contrib Project}}.
      ant-contribs 1.0b3 or later is needed for some less frequent build targets.
 
-  *Install APR and APR-Util or place source in apr and apr-util directories in same parent directory
-      as log4cxx directory.
-
+  *Install APR and APR-Util or place source in apr and apr-util directories as a 
+  sibling to the log4cxx directory.
         
    Building and testing log4cxx on a Unix platform with packaged APR and APR-Util.  
 
@@ -100,7 +99,7 @@
 | build-projects-vc9    | Build Microsoft Visual Studio 2008 project files.                                           |
 *-----------------------+---------------------------------------------------------------------------------------------+
 | build-projects-xcode  | Build Apple Xcode project files.                                                            |
-*---------------------+-----------------------------------------------------------------------------------------------+
+*-----------------------+---------------------------------------------------------------------------------------------+
 
    All build products will be placed in the target subdirectory.  
    
@@ -118,7 +117,7 @@
 *-------------------+---------------------------------------------------------------------------------------------+
 | -Ddebug           |  Build for debugging, yes (default), no.                                                    |
 *-------------------+---------------------------------------------------------------------------------------------+
-| -Dfind            |  Attempt to locate APR and APR-Util at expected locations, yes (default), no.               |
+| -Dfind            |  Attempt to locate compiled APR and APR-Util, yes (default), no.                            |
 *-------------------+---------------------------------------------------------------------------------------------+
 | -Dwith-apr        | path to non-default location for APR.                                                       |
 *-------------------+---------------------------------------------------------------------------------------------+
@@ -161,6 +160,11 @@
   
   If -Dwith-SMTP=libesmtp is specified, the build will attempt to build
   libesmtp from source, unfortunately libesmtp depends on poll.h and will not build.
+  
+  APR 1.2.12 has a known issue that will prevent
+  compilation with Visual Studio 6 unless a later Platform SDK is installed.
+  See APR bug {{{http://issues.apache.org/bugzilla/show_bug.cgi?44327}44327}}.
+  APR 1.2.11 and the corresponding APR-Util 1.2.10 will compile with Visual Studio 6.  
 
   
   *** Cygwin:
diff --git a/src/site/apt/building/vstudio.apt b/src/site/apt/building/vstudio.apt
index f61aea2..35fa51f 100644
--- a/src/site/apt/building/vstudio.apt
+++ b/src/site/apt/building/vstudio.apt
@@ -20,14 +20,39 @@
 
 Building Apache log4cxx with Microsoft Visual Studio
 
+*Preparation
+
++----+
+unzip apr-1.2.11-win32-src.zip
+rename apr-1.2.11 apr
+unzip apr-util-1.2.10-win32-src.zip
+rename apr-util-1.2.10 apr-util
+cd apache-log4cxx-0.10.0
+configure
+configure-aprutil
++----+
+
+  configure.bat copies the prefabricated log4cxx.hw and private/log4cxx_private.hw over
+  to log4cxx.h and private/log4cxx_private.h.
+  
+  configure-aprutil.bat uses "sed" to modify apu.hw and apr_ldap.hw to disable APR-Iconv
+  and LDAP which are not necessary for log4cxx and problematic to build.
+  If "sed" is not available, the modifications would be trivial to do in any text editor.
+  
+  Use the Win32 source zips for APR and APR-Util to preserve the required line endings
+  for the project files.  Directories need to be renamed to "apr" and "apr-util" respectively.
+
+  
+
 *Building log4cxx.dll
 
-   Extract APR and APR-util into neigboring directories to log4cxx and 
-   rename to apr and apr-util.  Open projects/log4cxx.dsw with Microsoft
+   Open projects/log4cxx.dsw with Microsoft
    Visual Studio 6 or later at which time you may be prompted to
    upgrade the projects to the format used by your version
    of Microsoft Visual Studio.
    
+   Select log4cxx as active project and build.
+   
    
 *Running unit tests
 
@@ -38,12 +63,24 @@
    of Microsoft Visual Studio, either in the Control Panel or
    in a Command Prompt uses to launch Microsoft Visual Studio.
 
-   Prepare APR and APR-Util as previously discussed.
    Open projects/testsuite.dsw or projects/testsuite-standalone.dsw
    (test suite and implementation in one project) in Microsoft Visual
-   Studio.
+   Studio, select active project and build.
 
    On the Debug Tab of the Project/Settings dialog,
    set the Working Directory to "../src/test/resources".
    Individual tests can be specified in Program Arguments
    and "-v" can be specified to output verbose test results.
+
+
+*Known Issues
+
+  *APR 1.2.12 has a known issue that will prevent
+  compilation with Visual Studio 6 unless a later Platform SDK is installed.
+  See APR bug {{{http://issues.apache.org/bugzilla/show_bug.cgi?44327}44327}}.
+  APR 1.2.11 and the corresponding APR-Util 1.2.10 will compile with Visual Studio 6.
+  
+  *APR-Util requires later LDAP headers than provided with Visual Studio 6
+  and will fail to compile.  log4cxx does not use LDAP, it can be disabled in apr_ldap.hw.
+  
+  *APR-Iconv is problematic and not used by log4cxx, it can be disabled in apu.hw.
diff --git a/src/site/apt/building/xcode.apt b/src/site/apt/building/xcode.apt
index 0a25285..01669c9 100644
--- a/src/site/apt/building/xcode.apt
+++ b/src/site/apt/building/xcode.apt
@@ -22,12 +22,21 @@
 
 *Building log4cxx.dylib
 
+   Run configure to generate log4cxx.h and log4cxx_private.h.
+   
++----+
+cd apache-log4cxx-0.10.0
+./autogen.sh
+./configure
++----+   
+
    Open projects/log4cxx.xcodeproj with Xcode 2.4 or later, address issues described below
    and build as normal. 
 
 *Running unit tests
 
-   Open projects/testsuite.xcodeproj or projects/testsuite-standalone.xcodeproj
+   Generate include files are previously described, open projects/testsuite.xcodeproj 
+   or projects/testsuite-standalone.xcodeproj
    (test suite and implementation in one project) in Xcode and address issues
    described below.