diff --git a/Spring.Net.2005.sln b/Spring.Net.2005.sln
index 3b59bc15..5b391af6 100644
--- a/Spring.Net.2005.sln
+++ b/Spring.Net.2005.sln
@@ -403,6 +403,7 @@ Global
 		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9FE720ED-2BD9-4FB9-89C8-FFFA4A491CB5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|.NET.Build.0 = Debug|Any CPU
 		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -413,6 +414,7 @@ Global
 		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AEB1578C-9018-4D49-B440-789F38DD2F29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|.NET.Build.0 = Debug|Any CPU
 		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FA7A6931-7DBE-4A32-A312-51FAD2E80332}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
diff --git a/Spring.build b/Spring.build
index b4e770e8..bde0951b 100644
--- a/Spring.build
+++ b/Spring.build
@@ -308,6 +308,7 @@
     <nant buildfile="src/Spring/Spring.Services/Spring.Services.build" target="build" if="${build-services}"/>
     <nant buildfile="src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build" target="build" if="${build-testing}"/>
     <nant buildfile="src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build" target="build" if="${build-nms}"/>
+    <nant buildfile="src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build" target="build" if="${build-ems}"/>
     <nant buildfile="src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.build" target="build" if="${build-quartz}"/>
     <nant buildfile="src/Spring/Spring.Messaging/Spring.Messaging.build" target="build" if="${build-msmq}"/>
 
@@ -329,6 +330,7 @@
     <nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web}"/>
     <nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test"/>
     <nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="${build-nms}"/>
+    <nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-ems-tests}"/>
     <nant buildfile="test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="build" if="${build-quartz}"/>
     <nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq-tests}"/>
   </target>
@@ -341,6 +343,8 @@
     <!-- disable namespaces not supported in net-1.0 -->
     <property name="build-web" value="false" />
     <property name="build-nms" value="false" />
+    <property name="build-ems" value="false" />
+    <property name="build-ems-tests" value="false" />
     <property name="build-quartz" value="false" />
     <property name="build-msmq" value="false" />
     <property name="build-msmq-tests" value="false" />
@@ -352,6 +356,8 @@
     <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
     <property name="build-nms" value="false" />
+    <property name="build-ems" value="false" />
+    <property name="build-ems-tests" value="false" />
     <property name="build-quartz" value="true" />
     <property name="build-msmq" value="false" />
     <property name="build-msmq-tests" value="false" />
@@ -363,6 +369,8 @@
     <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
     <property name="build-nms" value="true" />
+    <property name="build-ems" value="true" />
+    <property name="build-ems-tests" value="false" />
     <property name="build-quartz" value="true" />
     <property name="build-msmq" value="true" />
     <property name="build-msmq-tests" value="false" />
@@ -374,6 +382,8 @@
     <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
     <property name="build-nms" value="true" />
+    <property name="build-ems" value="true" />
+    <property name="build-ems-tests" value="false" />
     <property name="build-quartz" value="true" />
     <property name="build-msmq" value="false" />
     <property name="build-msmq-tests" value="false" />
@@ -527,6 +537,8 @@
 	<delete dir="src/Spring/Spring.Services/bin" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Messaging.Nms/obj" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Messaging.Nms/bin" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Messaging.Ems/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Messaging.Ems/bin" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Messaging/obj" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Messaging/bin" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Scheduling.Quartz/obj" failonerror="false"/>
@@ -558,6 +570,8 @@
 	<delete dir="test/Spring/Spring.Services.Tests/bin" failonerror="false"/>
 	<delete dir="test/Spring/Spring.Messaging.Nms.Tests/obj" failonerror="false"/>
 	<delete dir="test/Spring/Spring.Messaging.Nms.Tests/bin" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Messaging.Ems.Tests/obj" failonerror="false"/>
+	<delete dir="test/Spring/Spring.Messaging.Ems.Tests/bin" failonerror="false"/>
 	<delete dir="test/Spring/Spring.Messaging.Tests/obj" failonerror="false"/>
 	<delete dir="test/Spring/Spring.Messaging.Tests/bin" failonerror="false"/>
 	<delete dir="test/Spring/Spring.Scheduling.Quartz.Tests/obj" failonerror="false"/>
@@ -885,6 +899,10 @@
           <include name="**/Spring.Messaging.Nms.xml"/>
           <include name="**/Spring.Messaging.Nms.pdb"/>
 
+          <include name="**/Spring.Messaging.Ems.dll"/>
+          <include name="**/Spring.Messaging.Ems.xml"/>
+          <include name="**/Spring.Messaging.Ems.pdb"/>
+
           <include name="**/Spring.Messaging.dll"/>
           <include name="**/Spring.Messaging.xml"/>
           <include name="**/Spring.Messaging.pdb"/>
@@ -1063,6 +1081,9 @@
     <copy todir="${current.package.dir}/doc/schema"
           file="src/Spring/Spring.Messaging.Nms/Messaging/Nms/Config/spring-nms-1.2.xsd"/>
 
+    <copy todir="${current.package.dir}/doc/schema"
+          file="src/Spring/Spring.Messaging.Ems/Messaging/Ems/Config/spring-ems-1.2.xsd"/>
+
     <copy todir="${current.package.dir}/doc/schema"
           file="build-support/install-schema.build"/>
 
@@ -1284,6 +1305,10 @@
       <include name="examples/Spring/Spring.Web.Extensions.Example/src/Spring.Web.Extensions.Example.2005/Bin/*.refresh"/>
       <include name="examples/Spring/SpringAir/**"/>
       <include name="examples/SpringAir/src/SpringAir.Web.2005/bin/*.refresh"/>
+      <include name="examples/Spring/Spring.Scheduling.Quartz.Example/**"/>
+      <include name="examples/Spring/Spring.NmsQuickStart/**"/>
+      
+
 
 
       <exclude name="src/Spring/Spring.Services/*WindowsService*"/>