diff --git a/ivy/src/main/scala/org/apache/ivy/plugins/parser/m2/EvilHackery.scala b/ivy/src/main/scala/org/apache/ivy/plugins/parser/m2/EvilHackery.scala
new file mode 100644
index 000000000..f76637404
--- /dev/null
+++ b/ivy/src/main/scala/org/apache/ivy/plugins/parser/m2/EvilHackery.scala
@@ -0,0 +1,93 @@
+package org.apache.ivy.plugins.parser.m2
+
+import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
+
+/**
+ * Helper evil hackery method to ensure Maven configurations + Ivy i
+ */
+object EvilHackery {
+
+  val REPLACEMENT_MAVEN_MAPPINGS = {
+    // Here we copy paste from Ivy
+    val REPLACEMENT_MAPPINGS = new java.util.HashMap[String, PomModuleDescriptorBuilder.ConfMapper]
+
+    REPLACEMENT_MAPPINGS.put("compile", new PomModuleDescriptorBuilder.ConfMapper {
+      def addMappingConfs(dd: DefaultDependencyDescriptor, isOptional: Boolean) {
+        if (isOptional) {
+          dd.addDependencyConfiguration("optional", "compile(*)")
+          // NOTE - This is the problematic piece we're dropping.  EVIL!!!!
+          dd.addDependencyConfiguration("optional", "master(compile)")
+        } else {
+          dd.addDependencyConfiguration("compile", "compile(*)")
+          // NOTE - This is the problematic piece we're dropping, as `master` is not special cased.
+          dd.addDependencyConfiguration("compile", "master(compile)")
+          dd.addDependencyConfiguration("runtime", "runtime(*)")
+        }
+      }
+    })
+
+    REPLACEMENT_MAPPINGS.put("provided", new PomModuleDescriptorBuilder.ConfMapper {
+      def addMappingConfs(dd: DefaultDependencyDescriptor, isOptional: Boolean) {
+        if (isOptional) {
+          dd.addDependencyConfiguration("optional", "compile(*)")
+          dd.addDependencyConfiguration("optional", "provided(*)")
+          dd.addDependencyConfiguration("optional", "runtime(*)")
+          // Remove evil hackery
+          dd.addDependencyConfiguration("optional", "master(compile)")
+        } else {
+          dd.addDependencyConfiguration("provided", "compile(*)")
+          dd.addDependencyConfiguration("provided", "provided(*)")
+          dd.addDependencyConfiguration("provided", "runtime(*)")
+          // Remove evil hackery
+          dd.addDependencyConfiguration("provided", "master(compile)")
+        }
+      }
+    })
+
+    REPLACEMENT_MAPPINGS.put("runtime", new PomModuleDescriptorBuilder.ConfMapper {
+      def addMappingConfs(dd: DefaultDependencyDescriptor, isOptional: Boolean) {
+        if (isOptional) {
+          dd.addDependencyConfiguration("optional", "compile(*)")
+          dd.addDependencyConfiguration("optional", "provided(*)")
+          // Remove evil hackery
+          dd.addDependencyConfiguration("optional", "master(compile)")
+        } else {
+          dd.addDependencyConfiguration("runtime", "compile(*)")
+          dd.addDependencyConfiguration("runtime", "runtime(*)")
+          // Remove evil hackery
+          dd.addDependencyConfiguration("runtime", "master(compile)")
+        }
+      }
+    })
+
+    REPLACEMENT_MAPPINGS.put("test", new PomModuleDescriptorBuilder.ConfMapper {
+      def addMappingConfs(dd: DefaultDependencyDescriptor, isOptional: Boolean) {
+        dd.addDependencyConfiguration("test", "runtime(*)")
+        // Remove evil hackery
+        dd.addDependencyConfiguration("test", "master(compile)")
+      }
+    })
+
+    REPLACEMENT_MAPPINGS.put("system", new PomModuleDescriptorBuilder.ConfMapper {
+      def addMappingConfs(dd: DefaultDependencyDescriptor, isOptional: Boolean) {
+        // Hacked
+        dd.addDependencyConfiguration("system", "master(compile)")
+      }
+    })
+
+    REPLACEMENT_MAPPINGS
+  }
+
+  def init(): Unit = {
+    // SUPER EVIL INITIALIZATION
+    try {
+      val map = PomModuleDescriptorBuilder.MAVEN2_CONF_MAPPING.asInstanceOf[java.util.Map[String, PomModuleDescriptorBuilder.ConfMapper]]
+      map.clear()
+      map.putAll(REPLACEMENT_MAVEN_MAPPINGS)
+    } catch {
+      case e: Exception =>
+        // TODO - Log that Ivy may not be configured correctly and you could have maven/ivy issues.
+        throw new RuntimeException("FAILURE to install Ivy maven hooks.  Your ivy-maven interaction may suffer resolution errors", e)
+    }
+  }
+}
\ No newline at end of file
diff --git a/ivy/src/main/scala/sbt/CustomPomParser.scala b/ivy/src/main/scala/sbt/CustomPomParser.scala
index bcb8a2476..e19f01a9c 100644
--- a/ivy/src/main/scala/sbt/CustomPomParser.scala
+++ b/ivy/src/main/scala/sbt/CustomPomParser.scala
@@ -4,7 +4,7 @@ import org.apache.ivy.core.module.id.ModuleRevisionId
 import org.apache.ivy.core.module.descriptor.{ DefaultArtifact, DefaultExtendsDescriptor, DefaultModuleDescriptor, ModuleDescriptor }
 import org.apache.ivy.core.module.descriptor.{ DefaultDependencyDescriptor, DependencyDescriptor }
 import org.apache.ivy.plugins.parser.{ ModuleDescriptorParser, ModuleDescriptorParserRegistry, ParserSettings }
-import org.apache.ivy.plugins.parser.m2.{ PomModuleDescriptorBuilder, PomModuleDescriptorParser }
+import org.apache.ivy.plugins.parser.m2.{ EvilHackery, PomModuleDescriptorBuilder, PomModuleDescriptorParser }
 import org.apache.ivy.plugins.repository.Resource
 import org.apache.ivy.plugins.namespace.NamespaceTransformer
 import org.apache.ivy.util.extendable.ExtendableItem
@@ -27,6 +27,10 @@ final class CustomPomParser(delegate: ModuleDescriptorParser, transform: (Module
   override def getMetadataArtifact(mrid: ModuleRevisionId, res: Resource) = delegate.getMetadataArtifact(mrid, res)
 }
 object CustomPomParser {
+
+  // Evil hackery to override the default maven pom mappings.
+  EvilHackery.init()
+
   /** The key prefix that indicates that this is used only to store extra information and is not intended for dependency resolution.*/
   val InfoKeyPrefix = "info."
   val ApiURLKey = "info.apiURL"
diff --git a/sbt/src/sbt-test/dependency-management/exclude-transitive/project/TestProject.scala b/sbt/src/sbt-test/dependency-management/exclude-transitive/project/TestProject.scala
index c5f3887ff..7e2796e5b 100644
--- a/sbt/src/sbt-test/dependency-management/exclude-transitive/project/TestProject.scala
+++ b/sbt/src/sbt-test/dependency-management/exclude-transitive/project/TestProject.scala
@@ -16,9 +16,14 @@ object TestProject extends Build
 	private def check(transitive: Boolean) =
 		(dependencyClasspath in Compile) map { downloaded =>
 			val jars = downloaded.size
-			if(transitive)
-				if(jars <= 2) error("Transitive dependencies not downloaded") else ()
-			else
-				if(jars > 2) error("Transitive dependencies downloaded (" + downloaded.files.mkString(", ") + ")") else ()
+			if(transitive) {
+        if (jars <= 2)
+          sys.error(s"Transitive dependencies not downloaded, found:\n * ${downloaded.mkString("\n * ")}")
+        else ()
+      } else {
+        if (jars > 2)
+          sys.error(s"Transitive dependencies not downloaded, found:\n * ${downloaded.mkString("\n * ")}")
+        else ()
+      }
 		}
 }
diff --git a/sbt/src/sbt-test/dependency-management/exclude-transitive/test b/sbt/src/sbt-test/dependency-management/exclude-transitive/test
index b7200b24b..511952ae3 100644
--- a/sbt/src/sbt-test/dependency-management/exclude-transitive/test
+++ b/sbt/src/sbt-test/dependency-management/exclude-transitive/test
@@ -1,3 +1,4 @@
+> debug
 # load the project definition with transitive dependencies enabled
 # and check that they are not downloaded
 #$ pause