diff --git a/changelog.html b/changelog.html
index 5203c5b6049fd9997d7bbf427d67fc4bf3971dab..0dc7afd85ad1c1e34d7a02c5693b2c253532c67f 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,8 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    <tt>install-plugin</tt> CLI command fails to put a file in the right location when installing from URL.
   <li class=bug>
     Fixed a bug where long post-production processing in matrix jobs can cause incorrect abortion.
 </ul>
diff --git a/core/src/main/java/hudson/cli/InstallPluginCommand.java b/core/src/main/java/hudson/cli/InstallPluginCommand.java
index a7736609fd6eef96d6c85317e5108d204ae83d55..444fbad9893f5b7f31ddda244b85cbb0948b94c7 100644
--- a/core/src/main/java/hudson/cli/InstallPluginCommand.java
+++ b/core/src/main/java/hudson/cli/InstallPluginCommand.java
@@ -95,8 +95,8 @@ public class InstallPluginCommand extends CLICommand {
                 stdout.println(Messages.InstallPluginCommand_InstallingPluginFromUrl(u));
                 if (name==null) {
                     name = u.getPath();
-                    name = name.substring(name.indexOf('/')+1);
-                    name = name.substring(name.indexOf('\\')+1);
+                    name = name.substring(name.lastIndexOf('/')+1);
+                    name = name.substring(name.lastIndexOf('\\')+1);
                     int idx = name.lastIndexOf('.');
                     if (idx>0)  name = name.substring(0,idx);
                 }