diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java
index caac1bcb21..f61b96e7cf 100644
--- a/core/src/main/java/hudson/PluginWrapper.java
+++ b/core/src/main/java/hudson/PluginWrapper.java
@@ -209,10 +209,10 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
             if(idx==-1)
                 throw new IllegalArgumentException("Illegal dependency specifier "+s);
             this.shortName = s.substring(0,idx);
-            this.version = s.substring(idx+1);
-            
+            String version = s.substring(idx+1);
+
             boolean isOptional = false;
-            String[] osgiProperties = s.split(";");
+            String[] osgiProperties = version.split("[;]");
             for (int i = 1; i < osgiProperties.length; i++) {
                 String osgiProperty = osgiProperties[i].trim();
                 if (osgiProperty.equalsIgnoreCase("resolution:=optional")) {
@@ -220,6 +220,11 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
                 }
             }
             this.optional = isOptional;
+            if (isOptional) {
+                this.version = osgiProperties[0];
+            } else {
+                this.version = version;
+            }
         }
 
         @Override
diff --git a/core/src/test/java/hudson/PluginWrapperTest.java b/core/src/test/java/hudson/PluginWrapperTest.java
new file mode 100644
index 0000000000..f9ffe3dd4e
--- /dev/null
+++ b/core/src/test/java/hudson/PluginWrapperTest.java
@@ -0,0 +1,26 @@
+package hudson;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class PluginWrapperTest {
+
+    @Test
+    public void dependencyTest() {
+        String version = "plugin:0.0.2";
+        PluginWrapper.Dependency dependency = new PluginWrapper.Dependency(version);
+        assertEquals("plugin", dependency.shortName);
+        assertEquals("0.0.2", dependency.version);
+        assertEquals(false, dependency.optional);
+    }
+
+    @Test
+    public void optionalDependencyTest() {
+        String version = "plugin:0.0.2;resolution:=optional";
+        PluginWrapper.Dependency dependency = new PluginWrapper.Dependency(version);
+        assertEquals("plugin", dependency.shortName);
+        assertEquals("0.0.2", dependency.version);
+        assertEquals(true, dependency.optional);
+    }
+}
\ No newline at end of file