diff --git a/activemq-core/src/main/resources/META-INF/spring.handlers b/activemq-core/src/main/resources/META-INF/spring.handlers
index 26e3d19a5c..bf3c70d7b0 100644
--- a/activemq-core/src/main/resources/META-INF/spring.handlers
+++ b/activemq-core/src/main/resources/META-INF/spring.handlers
@@ -14,4 +14,5 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
+http\://activemq.apache.org/schema/core=org.apache.xbean.spring.context.v2.XBeanNamespaceHandler
 http\://activemq.org/config/1.0=org.apache.xbean.spring.context.v2.XBeanNamespaceHandler
diff --git a/activemq-core/src/main/resources/META-INF/spring.schemas b/activemq-core/src/main/resources/META-INF/spring.schemas
index b2cc974a7f..bb8e6aed93 100644
--- a/activemq-core/src/main/resources/META-INF/spring.schemas
+++ b/activemq-core/src/main/resources/META-INF/spring.schemas
@@ -14,11 +14,9 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-# resolve remote XSD documents to local classpath schema
-http\://activemq.apache.org/schema/activemq-core.xsd = activemq.xsd
-http\://activemq.apache.org/schema/activemq-core-5.0.xsd = activemq.xsd
 
 # attempt to resolve the namespace URI to a schema if no XSD is mentioned in the doc
 # TODO this is EXPERIMENTAL - it might not actually be used!
 http\://activemq.org/config/1.0=activemq.xsd
-http\://activemq.org/config/1.0/1.0.xsd=activemq.xsd
\ No newline at end of file
+http\://activemq.org/config/1.0/1.0.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core=activemq.xsd