diff --git a/.idea/libraries/jsch_agent_proxy.xml b/.idea/libraries/jsch_agent_proxy.xml
new file mode 100644
index 000000000000..f93e3e59f6db
--- /dev/null
+++ b/.idea/libraries/jsch_agent_proxy.xml
@@ -0,0 +1,21 @@
+<component name="libraryTable">
+  <library name="jsch-agent-proxy">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/jsch.agentproxy.usocket-nc.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jsch.agentproxy.usocket-jna.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jsch.agentproxy.sshagent.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jsch.agentproxy.pageant.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jsch.agentproxy.core.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jsch.agentproxy.connector-factory.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/jsch-agent-proxy.zip!/jsch-agent-proxy-0.0.6/jsch-agent-proxy-core/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/jsch-agent-proxy.zip!/jsch-agent-proxy-0.0.6/jsch-agent-proxy-pageant/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/jsch-agent-proxy.zip!/jsch-agent-proxy-0.0.6/jsch-agent-proxy-sshagent/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/jsch-agent-proxy.zip!/jsch-agent-proxy-0.0.6/jsch-agent-proxy-usocket-nc/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/jsch-agent-proxy.zip!/jsch-agent-proxy-0.0.6/jsch-agent-proxy-usocket-jna/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/jsch-agent-proxy.zip!/jsch-agent-proxy-0.0.6/jsch-agent-proxy-connector-factory/src/main/java" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 86f1fd4fe724..89829588beb9 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -199,6 +199,7 @@ libraryLicense(name: "JGoodies Looks", libraryName: "jgoodies-looks", version: "
 libraryLicense(name: "JGoodies Common", libraryName: "jgoodies-common", version: "1.2.1", license: "BSD ", url: "http://www.jgoodies.com/freeware/looks/", licenseUrl: "http://www.jgoodies.com/downloads/libraries.html")
 libraryLicense(name: "JNA", libraryName: "jna", version: "3.4.0", license: "LGPL 2.1", url: "https://jna.dev.java.net/", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1.php")
 libraryLicense(name: "JSch", libraryName: "JSch", version: "0.1.50", license: "BSD", url: "http://www.jcraft.com/jsch/", licenseUrl: "http://www.jcraft.com/jsch/LICENSE.txt")
+libraryLicense(name: "jsch-agent-proxy", libraryName: "jsch-agent-proxy", version: "0.0.6", license: "BSD", url: "https://github.com/ymnk/jsch-agent-proxy", licenseUrl: "https://github.com/ymnk/jsch-agent-proxy/blob/master/LICENSE.txt")
 libraryLicense(name: "JUnit", libraryName: "JUnit3", version: "3.8.1", license: "CPL 1.0", url: "http://junit.org/")
 libraryLicense(name: "JUnit", libraryName: "JUnit4", version: "4.11", license: "CPL 1.0", url: "http://junit.org/")
 libraryLicense(name: "Log4j", libraryName: "Log4J", version: "1.2.17", license: "Apache 2.0", url: "http://logging.apache.org/log4j/1.2/index.html", licenseUrl: "http://logging.apache.org/license.html")
diff --git a/lib/jsch.agentproxy.connector-factory.jar b/lib/jsch.agentproxy.connector-factory.jar
new file mode 100644
index 000000000000..da5a90ebe182
Binary files /dev/null and b/lib/jsch.agentproxy.connector-factory.jar differ
diff --git a/lib/jsch.agentproxy.core.jar b/lib/jsch.agentproxy.core.jar
new file mode 100644
index 000000000000..c821ac18dea0
Binary files /dev/null and b/lib/jsch.agentproxy.core.jar differ
diff --git a/lib/jsch.agentproxy.pageant.jar b/lib/jsch.agentproxy.pageant.jar
new file mode 100644
index 000000000000..12b49c386bf5
Binary files /dev/null and b/lib/jsch.agentproxy.pageant.jar differ
diff --git a/lib/jsch.agentproxy.sshagent.jar b/lib/jsch.agentproxy.sshagent.jar
new file mode 100644
index 000000000000..913b91f798c3
Binary files /dev/null and b/lib/jsch.agentproxy.sshagent.jar differ
diff --git a/lib/jsch.agentproxy.usocket-jna.jar b/lib/jsch.agentproxy.usocket-jna.jar
new file mode 100644
index 000000000000..c21413244068
Binary files /dev/null and b/lib/jsch.agentproxy.usocket-jna.jar differ
diff --git a/lib/jsch.agentproxy.usocket-nc.jar b/lib/jsch.agentproxy.usocket-nc.jar
new file mode 100644
index 000000000000..9d0b384f1706
Binary files /dev/null and b/lib/jsch.agentproxy.usocket-nc.jar differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index c368b9076142..2172a82609da 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -29,6 +29,12 @@ jh.jar
 jna-utils.jar
 jna.jar
 jsch-0.1.50.jar
+jsch.agentproxy.connector-factory.jar
+jsch.agentproxy.core.jar
+jsch.agentproxy.pageant.jar
+jsch.agentproxy.sshagent.jar
+jsch.agentproxy.usocket-jna.jar
+jsch.agentproxy.usocket-nc.jar
 jsr166e.jar
 jsr173_1.0_api.jar
 junit-4.11.jar
diff --git a/lib/src/jsch-agent-proxy.zip b/lib/src/jsch-agent-proxy.zip
new file mode 100644
index 000000000000..796cccf18edb
Binary files /dev/null and b/lib/src/jsch-agent-proxy.zip differ