diff --git a/changelog.html b/changelog.html
index aa9f431c1862abe92ea6944ac34b35d6136ae172..71f9f5a9130c4284652210a612897dc5dc39e783 100644
--- a/changelog.html
+++ b/changelog.html
@@ -74,6 +74,9 @@ Upcoming changes</a>
    <li class=bug>
      Accept any plugin with a 'test' goal as a test plugin in Maven jobs
      (<a href="https://issues.jenkins-ci.org/browse/JENKINS-8334">issue 8334</a>)
+   <li class=rfe>
+      Avoid unnecessary downloads if automatically installed tools are up-to-date
+      (<a href="https://issues.jenkins-ci.org/browse/JENKINS-16215">issue 16215</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 9bdfab31a4bdfe88b9083c078f5979cd909bf02c..e0b6dca298eb6d142cf158a64a61d099b3d5914f 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -727,8 +727,8 @@ public final class FilePath implements Serializable {
             try {
                 if(archive.toExternalForm().endsWith(".zip"))
                     unzipFrom(cis);
-            else
-                untarFrom(cis,GZIP);
+                else
+                    untarFrom(cis,GZIP);
             } catch (IOException e) {
                 throw new IOException2(String.format("Failed to unpack %s (%d bytes read of total %d)",
                         archive,cis.getByteCount(),con.getContentLength()),e);