diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7de821391b..44b88aef97 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -190,12 +190,11 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <optional>false</optional>
-    </dependency>
+      <artifactId>spring-aop</artifactId>
+    </dependency>      
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
+      <artifactId>spring-jms</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -203,7 +202,12 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-jms</artifactId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <optional>false</optional>
     </dependency>
 
     <dependency>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index ec4809255f..fd93c06ec5 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -145,6 +145,7 @@
         <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
         <include>org.apache.xbean:xbean-spring</include>
+        <include>org.springframework:spring-aop</include>
         <include>org.springframework:spring-core</include>
         <include>org.springframework:spring-beans</include>
         <include>org.springframework:spring-context</include>
diff --git a/pom.xml b/pom.xml
index 7209aa485d..240b2d7cc2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,7 @@
     <module>activemq-openwire-generator</module>
     <module>activemq-optional</module>
     <module>activemq-pool</module>
+    <module>activemq-protocol-buffer</module>
     <module>activemq-ra</module>
     <module>activemq-rar</module>
     <module>activemq-run</module>
@@ -465,10 +466,10 @@
       <!-- Optional Spring Support -->
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
+        <artifactId>spring-aop</artifactId>
         <version>${spring-version}</version>
         <optional>true</optional>
-      </dependency>
+      </dependency>      
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
@@ -483,13 +484,19 @@
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>spring-tx</artifactId>
+        <artifactId>spring-core</artifactId>
+        <version>${spring-version}</version>
+        <optional>true</optional>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jms</artifactId>
         <version>${spring-version}</version>
         <optional>true</optional>
       </dependency>      
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>spring-jms</artifactId>
+        <artifactId>spring-tx</artifactId>
         <version>${spring-version}</version>
         <optional>true</optional>
       </dependency>