diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 69a2ffe9de..d25d72b6a4 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -34,10 +34,6 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-toolchain</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-compat</artifactId>
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index d31f1c6618..c09cf2d019 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -104,6 +104,7 @@
           <version>1.0.0</version>
           <models>
             <model>src/main/mdo/settings.mdo</model>
+            <model>src/main/mdo/toolchains.mdo</model>
           </models>
         </configuration>
       </plugin>
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
index 91c9323225..d49e264bec 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
@@ -54,7 +54,6 @@ public class DefaultArtifactFilterManager
         artifacts.add( "classworlds" );
         artifacts.add( "plexus-classworlds" );
         artifacts.add( "commons-cli" );
-        //artifacts.add( "doxia-sink-api" );
         artifacts.add( "jsch" );
         artifacts.add( "maven-artifact" );
         artifacts.add( "maven-artifact-manager" );
@@ -73,10 +72,10 @@ public class DefaultArtifactFilterManager
         artifacts.add( "maven-project" );
         artifacts.add( "maven-repository-metadata" );
         artifacts.add( "maven-settings" );
+        artifacts.add( "maven-toolchain" );
         artifacts.add( "plexus-component-api" );
         artifacts.add( "plexus-container-default" );
         artifacts.add( "plexus-interactivity-api" );
-        //artifacts.add( "plexus-interpolation" );        
         artifacts.add( "wagon-provider-api" );
         artifacts.add( "wagon-file" );
         artifacts.add( "wagon-http-lightweight" );
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java b/maven-core/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java b/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/JavaToolChain.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolChain.java
similarity index 100%
rename from maven-toolchain/src/main/java/org/apache/maven/toolchain/java/JavaToolChain.java
rename to maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolChain.java
diff --git a/maven-toolchain/src/main/mdo/toolchains.mdo b/maven-core/src/main/mdo/toolchains.mdo
similarity index 100%
rename from maven-toolchain/src/main/mdo/toolchains.mdo
rename to maven-core/src/main/mdo/toolchains.mdo
diff --git a/maven-toolchain/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
similarity index 100%
rename from maven-toolchain/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
rename to maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index aad2fc4f5a..b9789c2798 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -40,10 +40,6 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-toolchain</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-repository</artifactId>
diff --git a/maven-toolchain/pom.xml b/maven-toolchain/pom.xml
deleted file mode 100644
index 012fca6ff0..0000000000
--- a/maven-toolchain/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-  <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
-    file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
-    to you 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.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
-    <version>3.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>maven-toolchain</artifactId>
-
-  <name>Maven Toolchains</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-component-annotations</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-metadata</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate-metadata</goal>
-              <goal>generate-test-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>java</goal>
-              <goal>xsd</goal>
-              <goal>xpp3-reader</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <version>1.0.0</version>
-          <packageWithVersion>false</packageWithVersion>
-          <models>
-            <model>src/main/mdo/toolchains.mdo</model>
-          </models>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/maven-toolchain/src/site/apt/index.apt b/maven-toolchain/src/site/apt/index.apt
deleted file mode 100644
index c4b4cc112b..0000000000
--- a/maven-toolchain/src/site/apt/index.apt
+++ /dev/null
@@ -1,17 +0,0 @@
- -----
- Maven Toolchains
- -----
- Hervé Boutemy
- -----
- 2009-04-26
- -----
-
-Maven Toolchains
-
- This is strictly the model for Maven Toolchains, so really just plain objects.
-
- The following are generated from this model:
-
-   * {{{apidocs/index.html}Java sources}} with Reader for the Xpp3 XML parser, to read <<<toolchains.xml>>> file
-
-   * A {{{toolchains.html}Descriptor Reference}}
diff --git a/maven-toolchain/src/site/site.xml b/maven-toolchain/src/site/site.xml
deleted file mode 100644
index 15f431a9c0..0000000000
--- a/maven-toolchain/src/site/site.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<project>
-  <body>
-    <menu ref="parent"/>
-    <menu ref="reports"/>
-  </body>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7875c70b1a..75e556fd84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,6 @@
     <module>maven-plugin-api</module>
     <module>maven-model-builder</module>
     <module>maven-embedder</module>
-    <module>maven-toolchain</module>
     <module>maven-compat</module>
     <module>maven-repository</module>
   </modules>
@@ -188,11 +187,6 @@
         <artifactId>maven-plugin-api</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-toolchain</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-embedder</artifactId>