diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/AnnotatedControllersBeanDefinitionParser.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/AnnotatedControllersBeanDefinitionParser.java
new file mode 100644
index 00000000000..ddc12a7401d
--- /dev/null
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/AnnotatedControllersBeanDefinitionParser.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.servlet.config;
+
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.w3c.dom.Element;
+
+/**
+ * {@link org.springframework.beans.factory.xml.BeanDefinitionParser} that parses the {@code annotated-controllers} element to setup
+ * <code>@Controller</code> configuration in a Spring MVC web application.
+ * 
+ * @author Keith Donald
+ */
+public class AnnotatedControllersBeanDefinitionParser extends AbstractBeanDefinitionParser {
+
+	@Override
+	protected AbstractBeanDefinition parseInternal(Element element, ParserContext context) {
+		throw new UnsupportedOperationException("Not yet implemented");
+	}
+
+}
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
new file mode 100644
index 00000000000..c0f6f91f7a9
--- /dev/null
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.servlet.config;
+
+import org.springframework.beans.factory.xml.NamespaceHandler;
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+
+/**
+ * {@link NamespaceHandler} for Spring MVC configuration namespace.
+ * @author Keith Donald
+ */
+public class MvcNamespaceHandler extends NamespaceHandlerSupport {
+
+	public void init() {
+		registerBeanDefinitionParser("annotated-controllers", new AnnotatedControllersBeanDefinitionParser());
+	}
+}
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/package-info.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/package-info.java
new file mode 100644
index 00000000000..b3817d1ae6e
--- /dev/null
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/package-info.java
@@ -0,0 +1,6 @@
+
+/**
+ * Defines the Spring MVC configuration namespace.
+ */
+package org.springframework.web.servlet.config;
+
diff --git a/org.springframework.web.servlet/src/main/resources/META-INF/spring.handlers b/org.springframework.web.servlet/src/main/resources/META-INF/spring.handlers
new file mode 100644
index 00000000000..b92dfeebba7
--- /dev/null
+++ b/org.springframework.web.servlet/src/main/resources/META-INF/spring.handlers
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/mvc=org.springframework.web.servlet.config.MvcNamespaceHandler
\ No newline at end of file
diff --git a/org.springframework.web.servlet/src/main/resources/META-INF/spring.schemas b/org.springframework.web.servlet/src/main/resources/META-INF/spring.schemas
new file mode 100644
index 00000000000..05aa9f714f3
--- /dev/null
+++ b/org.springframework.web.servlet/src/main/resources/META-INF/spring.schemas
@@ -0,0 +1 @@
+http\://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd=org/springframework/web/servlet/config/spring-mvc-3.0.xsd
\ No newline at end of file
diff --git a/org.springframework.web.servlet/src/main/resources/META-INF/spring.tooling b/org.springframework.web.servlet/src/main/resources/META-INF/spring.tooling
new file mode 100644
index 00000000000..93040949c66
--- /dev/null
+++ b/org.springframework.web.servlet/src/main/resources/META-INF/spring.tooling
@@ -0,0 +1,4 @@
+# Tooling related information for the mvc namespace
+http\://www.springframework.org/schema/mvc@name=mvc Namespace
+http\://www.springframework.org/schema/mvc@prefix=mvc
+http\://www.springframework.org/schema/mvc@icon=org/springframework/web/servlet/config/spring-mvc.gif
diff --git a/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd b/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
new file mode 100644
index 00000000000..f6ce54b79e6
--- /dev/null
+++ b/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsd:schema xmlns="http://www.springframework.org/schema/mvc"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:tool="http://www.springframework.org/schema/tool"
+	targetNamespace="http://www.springframework.org/schema/mvc"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans"
+		schemaLocation="http://www.springframework.org/schema/beans/spring-beans-3.0.xsd" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool"
+		schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.0.xsd" />
+
+	<xsd:element name="annotated-controllers">
+		<xsd:annotation>
+			<xsd:documentation
+				source="java:org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"><![CDATA[
+	Configures the Spring MVC @Controller programming model.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" />
+					<tool:exports type="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+	</xsd:element>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc.gif b/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc.gif
new file mode 100644
index 00000000000..20ed1f9a443
Binary files /dev/null and b/org.springframework.web.servlet/src/main/resources/org/springframework/web/servlet/config/spring-mvc.gif differ