diff --git a/Spring.build b/Spring.build
index 3d5f0053..58278f93 100644
--- a/Spring.build
+++ b/Spring.build
@@ -415,7 +415,6 @@ Commandline Examples:
     <nant buildfile="src/Spring/Spring.Web/Spring.Web.build" target="build" if="${build-web and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build" target="build" if="${build-web and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Data/Spring.Data.build" target="build" if="${build-data and not net-3.0}"/>
-    <nant buildfile="src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Data.NHibernate20/Spring.Data.NHibernate20.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
     <nant buildfile="src/Spring/Spring.Data.NHibernate21/Spring.Data.NHibernate21.build" target="build" if="${build-data and (nant.settings.currentframework == 'net-2.0' or nant.settings.currentframework == 'mono-2.0') and not net-3.0}"/>
@@ -434,8 +433,6 @@ Commandline Examples:
     <nant buildfile="test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.build" target="test" if="${build-aop and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Data.Tests/Spring.Data.Tests.build" target="test" if="${build-data and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Data.Integration.Tests/Spring.Data.Integration.Tests.build" target="test" if="${build-data and not net-3.0}"/>
-    <nant buildfile="test/Spring/Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
-    <nant buildfile="test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-1.1' or nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate20.Tests.build" target="test"
                  if="${build-data and nant.settings.currentframework == 'net-2.0' and not net-3.0}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build" target="test"
@@ -833,7 +830,6 @@ Commandline Examples:
 
     <call target="doc"/>
 
-
     <call target="package-release-files"/>
 
   </target>
@@ -1172,6 +1168,7 @@ Commandline Examples:
           <include name="**/Common.Logging.dll"/>
 
           <exclude name="**/3.0/**"/>
+          <exclude name="**/3.5/**"/>
           <exclude name="**/release/Spring/**"/>
           <exclude name="**/debug/Spring/**"/>
           <exclude name="**/examples/**"/>
@@ -1182,6 +1179,7 @@ Commandline Examples:
       </copy>
     </if>
 
+    <!-- copy over .NET 3.0 build of Spring.Services -->
     <if test="${net-3.0.installed}">
       <copy todir="${current.package.dir}/bin/net">
         <fileset basedir="./build/net">
@@ -1191,6 +1189,8 @@ Commandline Examples:
         </fileset>
       </copy>
     </if>
+
+
     <if test="${property::exists('build.allnamespaces') and build.allnamespaces}">
       <copy todir="${current.package.dir}/bin/net">
         <fileset basedir="./build/net">
@@ -1268,15 +1268,6 @@ Commandline Examples:
       </copy>
     </if>
 
-    <mkdir dir="${current.package.dir}/lib/NHibernate10"/>
-    <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">
-      <copy todir="${current.package.dir}/lib/NHibernate10">
-        <fileset basedir="lib/NHibernate10">
-          <include name="**/*.dll"/>
-          <include name="**/*.license.txt"/>
-        </fileset>
-      </copy>
-    </if>
 
     <mkdir dir="${current.package.dir}/lib/NHibernate12"/>
     <if test="${property::exists('build.allnamespaces') and not build.allnamespaces}">