diff --git a/CHANGES.txt b/CHANGES.txt
index 18d745e..ed2ead6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -710,6 +710,9 @@
     MAPREDUCE-2472. Extra whitespace in mapred.child.java.opts breaks JVM
     initialization. (Aaron T. Myers via todd)
 
+    MAPREDUCE-2222. Ivy resolve force mode should be turned off by default.
+    (Luke Lu via tomwhite)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES
diff --git a/ivy/ivysettings.xml b/ivy/ivysettings.xml
index ec2461b..0e8b825 100644
--- a/ivy/ivysettings.xml
+++ b/ivy/ivysettings.xml
@@ -35,6 +35,7 @@
   <property name="repo.dir" value="${user.home}/.m2/repository"/>
   <property name="maven2.pattern.ext"  value="${maven2.pattern}.[ext]"/>
   <property name="resolvers" value="default" override="false"/>
+  <property name="force-resolve" value="false" override="false"/>
   <settings defaultResolver="${resolvers}"/>
 
   <resolvers>
@@ -42,7 +43,7 @@
     <ibiblio name="apache-snapshot" root="${snapshot.apache.org}" m2compatible="true"
         checkmodified="true" changingPattern=".*SNAPSHOT"/>
 
-    <filesystem name="fs" m2compatible="true" force="true">
+    <filesystem name="fs" m2compatible="true" force="${force-resolve}">
        <artifact pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].[ext]"/>
        <ivy pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
     </filesystem>