diff --git a/.idea/libraries/commons_codec.xml b/.idea/libraries/commons_codec.xml
index 3921ae1a3395..f17cb04f9261 100644
--- a/.idea/libraries/commons_codec.xml
+++ b/.idea/libraries/commons_codec.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="commons-codec">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/commons-codec-1.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/commons-codec-1.8.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 55949c5b7f6d..01a28dfc9f72 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -159,7 +159,7 @@ libraryLicense(name: "classworlds", libraryName: "classworlds-1.1.jar", version:
 libraryLicense(name: "Android SDK Tools", libraryName: "android-sdk-tools", license: "Apache 2.0", url: "http://source.android.com/")
 libraryLicense(name: "Android SDK Tools JPS", libraryName: "android-sdk-tools-jps", license: "Apache 2.0", url: "http://source.android.com/")
 libraryLicense(name: "Apache Commons BeanUtils", libraryName: "commons-beanutils.jar", version: "1.6", license: "Apache 2.0", url: "http://commons.apache.org/beanutils/")
-libraryLicense(name: "Apache Commons Codec", libraryName: "commons-codec", version: "1.3", license: "Apache 2.0", url: "http://commons.apache.org/codec/", licenseUrl: "http://commons.apache.org/license.html")
+libraryLicense(name: "Apache Commons Codec", libraryName: "commons-codec", version: "1.8", license: "Apache 2.0", url: "http://commons.apache.org/codec/", licenseUrl: "http://commons.apache.org/license.html")
 libraryLicense(name: "Apache Commons Compress", libraryName: "commons-compress", version: "1.0", license: "Apache 2.0", url: "http://commons.apache.org/proper/commons-compress/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "Apache Commons Discovery", libraryName: "commons-discovery-0.4.jar", version: "0.4", license: "Apache 2.0", url: "http://jakarta.apache.org/commons/discovery/", licenseUrl: "http://commons.apache.org/license.html")
 libraryLicense(name: "Apache Commons HTTPClient", libraryName: "http-client-3.1", version: "3.1&nbsp; (with patch by JetBrains)", license: "Apache 2.0", url: "http://hc.apache.org/httpclient-3.x")
diff --git a/lib/commons-codec-1.3.jar b/lib/commons-codec-1.3.jar
deleted file mode 100644
index 957b6752af9a..000000000000
Binary files a/lib/commons-codec-1.3.jar and /dev/null differ
diff --git a/lib/commons-codec-1.8.jar b/lib/commons-codec-1.8.jar
new file mode 100644
index 000000000000..32f84c92b7bd
Binary files /dev/null and b/lib/commons-codec-1.8.jar differ
diff --git a/lib/src/commons-codec-1.8-sources.jar b/lib/src/commons-codec-1.8-sources.jar
new file mode 100644
index 000000000000..900af03df31e
Binary files /dev/null and b/lib/src/commons-codec-1.8-sources.jar differ