diff --git a/.idea/libraries/winp.xml b/.idea/libraries/winp.xml
index 6e23b6ef4581..07689aee601a 100644
--- a/.idea/libraries/winp.xml
+++ b/.idea/libraries/winp.xml
@@ -1,11 +1,12 @@
 <component name="libraryTable">
   <library name="winp">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/winp-1.17-patched.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/winp-1.21-patched.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/winp-1.17-patched-src.zip!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/winp-1.21-patched.zip!/winp-1.21/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/winp-1.21-patched.zip!/winp-1.21/src/test/java" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index cdf6fb10c823..b4a3c835999e 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -243,7 +243,7 @@ libraryLicense(name: "TestNG", version: "5.7 snapshot", license: "Apache 2.0", u
 libraryLicense(name: "Trilead SSH", libraryName: "trilead-ssh2", version: "build 213 and 217", license: "BSD style (see LICENSE.txt in trilead.jar)", url: "http://www.trilead.com/SSH_Library/")
 libraryLicense(name: "Trove4j", version: "1.1 (with patches by JetBrains)", license: "LGPL", url: "http://trove4j.sourceforge.net/", licenseUrl: "http://trove4j.sourceforge.net/html/license.html")
 libraryLicense(name: "Velocity", version: "1.7", license: "Apache 2.0", url: "http://velocity.apache.org/", licenseUrl: "http://velocity.apache.org/index.html")
-libraryLicense(name: "winp", version: "1.17 (patched)", license: "MIT", url: "http://java.net/projects/winp", licenseUrl: "http://opensource.org/licenses/mit-license.php")
+libraryLicense(name: "winp", version: "1.21 (patched)", license: "MIT", url: "http://java.net/projects/winp", licenseUrl: "http://opensource.org/licenses/mit-license.php")
 libraryLicense(name: "Xalan", libraryName:"Xalan-2.7.1", version: "2.7.1", license: "Apache 2.0", url: "http://xml.apache.org/xalan-j/", licenseUrl: "http://xml.apache.org/xalan-j/")
 libraryLicense(name: "Xerces", version: "2.9.1", license: "Apache 2.0", url: "http://xerces.apache.org/xerces2-j/", licenseUrl: "http://xerces.apache.org/xerces2-j/")
 libraryLicense(name: "XML Commons (xml-apis.jar, resolver.jar)", version: "", license: "Apache 2.0, W3C Software License , public domain", url: "http://xml.apache.org/commons/", licenseUrl: "http://xml.apache.org/commons/licenses.html")
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 05d8f7e23aeb..997eb52a6fc6 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -63,7 +63,7 @@ snappy-in-java-0.3.jar
 swingx-core-1.6.2.jar
 trove4j.jar
 velocity.jar
-winp-1.17-patched.jar
+winp-1.21-patched.jar
 xbean.jar
 xerces.jar
 xmlrpc-2.0.jar
diff --git a/lib/src/winp-1.17-patched-src.zip b/lib/src/winp-1.17-patched-src.zip
deleted file mode 100644
index 02f7972bc776..000000000000
Binary files a/lib/src/winp-1.17-patched-src.zip and /dev/null differ
diff --git a/lib/src/winp-1.21-patched.zip b/lib/src/winp-1.21-patched.zip
new file mode 100644
index 000000000000..24a308323632
Binary files /dev/null and b/lib/src/winp-1.21-patched.zip differ
diff --git a/lib/winp-1.17-patched.jar b/lib/winp-1.17-patched.jar
deleted file mode 100644
index 21a670e11aba..000000000000
Binary files a/lib/winp-1.17-patched.jar and /dev/null differ
diff --git a/lib/winp-1.21-patched.jar b/lib/winp-1.21-patched.jar
new file mode 100644
index 000000000000..76141dcd8911
Binary files /dev/null and b/lib/winp-1.21-patched.jar differ