diff --git a/org.springframework.jms/src/main/resources/META-INF/spring.handlers b/org.springframework.jms/src/main/resources/META-INF/spring.handlers
index 02cedcc67c5..c54d5bd5b1e 100644
--- a/org.springframework.jms/src/main/resources/META-INF/spring.handlers
+++ b/org.springframework.jms/src/main/resources/META-INF/spring.handlers
@@ -1 +1 @@
-http\://www.springframework.org/schema/jms=org.springframework.jms.config.JmsNamespaceHandler
+http\://www.springframework.org/schema/rabbitmq=org.springframework.amqp.rabbit.config.RabbitNamespaceHandler
diff --git a/org.springframework.jms/src/main/resources/META-INF/spring.schemas b/org.springframework.jms/src/main/resources/META-INF/spring.schemas
index cee622f1872..5a47fc39e91 100644
--- a/org.springframework.jms/src/main/resources/META-INF/spring.schemas
+++ b/org.springframework.jms/src/main/resources/META-INF/spring.schemas
@@ -1,3 +1,2 @@
-http\://www.springframework.org/schema/jms/spring-jms-2.5.xsd=org/springframework/jms/config/spring-jms-2.5.xsd
-http\://www.springframework.org/schema/jms/spring-jms-3.0.xsd=org/springframework/jms/config/spring-jms-3.0.xsd
-http\://www.springframework.org/schema/jms/spring-jms.xsd=org/springframework/jms/config/spring-jms-3.0.xsd
+http\://www.springframework.org/schema/rabbitmq/spring-rabbit-1.0.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-1.0.xsd
+http\://www.springframework.org/schema/rabbitmq/spring-rabbit.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-1.0.xsd
diff --git a/org.springframework.jms/src/main/resources/META-INF/spring.tooling b/org.springframework.jms/src/main/resources/META-INF/spring.tooling
index 1935cb1cd99..98455f1c7ad 100644
--- a/org.springframework.jms/src/main/resources/META-INF/spring.tooling
+++ b/org.springframework.jms/src/main/resources/META-INF/spring.tooling
@@ -1,4 +1,4 @@
 # Tooling related information for the jms namespace
-http\://www.springframework.org/schema/jms@name=jms Namespace
-http\://www.springframework.org/schema/jms@prefix=jms
-http\://www.springframework.org/schema/jms@icon=org/springframework/jms/config/spring-jms.gif
+http\://www.springframework.org/schema/rabbit@name=rabbit Namespace
+http\://www.springframework.org/schema/rabbit@prefix=rabbit
+http\://www.springframework.org/schema/rabbit@icon=org/springframework/amqp/rabbit/config/spring-rabbit.gif