diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index a03585a34c85887dfb4cb34d25e06559a85c7d33..b71c549ad0878f2274bbb2f0b89cced34db1f2f9 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -858,5 +858,9 @@ public class Functions {
         return projectName;
     }
 
+    public String getSystemProperty(String key) {
+        return System.getProperty(key);
+    }
+
     private static final Pattern SCHEME = Pattern.compile("[a-z]+://.+");
 }
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index ed567571afd00a5e442c5c5c890646f82aec3121..61df25f54dd2099d2c6f3d07525a18e6d2adc9ff 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -26,6 +26,7 @@ import java.util.logging.Logger;
 import org.apache.commons.logging.LogFactory;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.QueryParameter;
 
 /**
  * Manages {@link PluginWrapper}s.
@@ -171,6 +172,12 @@ public final class PluginManager extends AbstractModelObject {
         rsp.sendRedirect("../updateCenter/");
     }
 
+    public void doProxyConfigure(@QueryParameter("proxy.server") String server, @QueryParameter("proxy.port") String port, StaplerResponse rsp) throws IOException {
+        System.setProperty("http.proxyHost",Util.fixEmptyAndTrim(server));
+        System.setProperty("http.proxyPort",Util.fixEmptyAndTrim(port));
+        rsp.sendRedirect("./advanced");
+    }
+
     private final class UberClassLoader extends ClassLoader {
         public UberClassLoader() {
             super(PluginManager.class.getClassLoader());
diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly
index 656b7494f9cceb370851204e8c84547575a14242..59949852eb46919ce97a3911d32b86fed948fa48 100644
--- a/core/src/main/resources/hudson/PluginManager/advanced.jelly
+++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly
@@ -11,7 +11,37 @@
       </tr>
       <tr>
         <td>
-          Big table
+          <h1>${%HTTP Proxy Configuration}</h1>
+          <f:form method="post" action="proxyConfigure">
+            <f:block>
+              <f:entry title="HTTP proxy server" help="/help/update-center/proxy-server.html">
+                <f:textbox name="proxy.server" value="${h.getSystemProperty('http.proxyHost')}" />
+              </f:entry>
+              <f:entry title="HTTP proxy port" help="/help/update-center/proxy-port.html">
+                <f:textbox name="proxy.port" value="${h.getSystemProperty('http.proxyPort')}" />
+              </f:entry>
+            </f:block>
+            <f:block>
+              <f:submit value="${%Submit}" />
+            </f:block>
+          </f:form>
+
+          <h1>${%Upload Plugin}</h1>
+          <f:form method="post" action="uploadPlugin" enctype="multipart/form-data">
+            <f:block>
+              <div style="margin-bottom: 1em;">
+               ${%uploadtext}
+              </div>
+            </f:block>
+            <f:block>
+              <!-- @size is for other browsers, @style is for IE -->
+              ${%File}: <input type="file" name="name" class="setting-input" style="width:80%" size='40' />
+            </f:block>
+            <f:block>
+              <f:submit value="${%Upload}" />
+            </f:block>
+          </f:form>
+
         </td>
       </tr>
     </local:tabBar>
diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly
index 09365e80f42f9ba0c8841e62314e8ad5675ec734..a1d878cc4d71a995c3b12ebabb4d44f2a626e0c5 100644
--- a/core/src/main/resources/hudson/PluginManager/installed.jelly
+++ b/core/src/main/resources/hudson/PluginManager/installed.jelly
@@ -96,22 +96,6 @@
 
         updateMsg(); // set the initial state
       </script>
-
-      <s:form method="post" action="uploadPlugin" enctype="multipart/form-data">
-        <s:block>
-          <h1>${%Upload Plugin}</h1>
-          <div style="margin-bottom: 1em;">
-           ${%uploadtext}
-          </div>
-        </s:block>
-        <s:block>
-          <!-- @size is for other browsers, @style is for IE -->
-          ${%File}: <input type="file" name="name" class="setting-input" style="width:80%" size='40' />
-        </s:block>
-        <s:block><div>
-          <s:submit value="${%Upload}" />
-        </div></s:block>
-      </s:form>
     </l:main-panel>
   </l:layout>
 </j:jelly>