diff --git a/Spring.build b/Spring.build
index 834eeb04..e0cb9a88 100644
--- a/Spring.build
+++ b/Spring.build
@@ -311,6 +311,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/Spring.Messaging.build" target="build" if="${build-msmq}"/>
 
 
     <!-- build examples -->
@@ -327,9 +328,10 @@
     <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'}"/>
     <nant buildfile="test/Spring/Spring.Data.NHibernate20.Integration.Tests/Spring.Data.NHibernate20.Integration.Tests.build" target="test" if="${build-data and nant.settings.currentframework == 'net-2.0'}"/>
     <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
-    <nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-nms}"/>
+    <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="false"/>
+    <nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="${build-nms}"/>
+    <nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq-tests}"/>
   </target>
 
   <target name="compile-net-1.0" description="Builds .NET Framework 1.0 version"
@@ -340,6 +342,8 @@
     <!-- disable namespaces not supported in net-1.0 -->
     <property name="build-web" value="false" />
     <property name="build-nms" value="false" />
+    <property name="build-msmq" value="false" />
+    <property name="build-msmq-tests" value="false" />
     <call target="compile-test" />
   </target>
 
@@ -348,6 +352,8 @@
     <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
     <property name="build-nms" value="false" />
+    <property name="build-msmq" value="false" />
+    <property name="build-msmq-tests" value="false" />
     <call target="compile-test" />
   </target>
 
@@ -356,6 +362,8 @@
     <call target="copykeys" if="${project.build.sign}"/>
     <call target="common.generate-assemblyinfo"/>
     <property name="build-nms" value="true" />
+    <property name="build-msmq" value="true" />
+    <property name="build-msmq-tests" value="false" />
     <call target="compile-test" />
   </target>
 
@@ -513,6 +521,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/obj" failonerror="false"/>
+	<delete dir="src/Spring/Spring.Messaging/bin" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Scheduling.Quartz/obj" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Scheduling.Quartz/bin" failonerror="false"/>
 	<delete dir="src/Spring/Spring.Testing.NUnit/obj" failonerror="false"/>
@@ -542,6 +552,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.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"/>
 	<delete dir="test/Spring/Spring.Scheduling.Quartz.Tests/bin" failonerror="false"/>
 	<delete dir="test/Spring/Spring.Web.Tests/obj" failonerror="false"/>
@@ -866,6 +878,12 @@
           <include name="**/Spring.Testing.NUnit.pdb"/>
 
           <include name="**/Spring.Messaging.Nms.dll"/>
+          <include name="**/Spring.Messaging.Nms.xml"/>
+          <include name="**/Spring.Messaging.Nms.pdb"/>
+
+          <include name="**/Spring.Messaging.dll"/>
+          <include name="**/Spring.Messaging.xml"/>
+          <include name="**/Spring.Messaging.pdb"/>
 
           <include name="**/antlr.runtime.dll"/>
           <include name="**/Common.Logging.dll"/>