diff --git a/pom.xml b/pom.xml
index 306f04af851..dead5060a82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,16 +117,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-asl</artifactId>
-            <version>1.9.7</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.0.4</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-smile</artifactId>
-            <version>1.9.7</version>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-smile</artifactId>
+            <version>2.0.4</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java b/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java
index 84456085f60..bab2205b986 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.common.xcontent;
 
-import org.codehaus.jackson.smile.SmileConstants;
+import com.fasterxml.jackson.dataformat.smile.SmileConstants;
 import org.elasticsearch.ElasticSearchIllegalArgumentException;
 import org.elasticsearch.ElasticSearchParseException;
 import org.elasticsearch.common.bytes.BytesReference;
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentString.java b/src/main/java/org/elasticsearch/common/xcontent/XContentString.java
index c94b17bebf3..af77478b20d 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/XContentString.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/XContentString.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.common.xcontent;
 
-import org.codehaus.jackson.io.SerializedString;
+import com.fasterxml.jackson.core.io.SerializedString;
 
 /**
  *
diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java
index 439002eab7b..307b49f911a 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java
@@ -19,10 +19,10 @@
 
 package org.elasticsearch.common.xcontent.json;
 
-import org.codehaus.jackson.JsonEncoding;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonParser;
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.FastStringReader;
 import org.elasticsearch.common.xcontent.*;
diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java
index 5bd851ab4b3..b92330775ae 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.common.xcontent.json;
 
-import org.codehaus.jackson.JsonGenerator;
+import com.fasterxml.jackson.core.JsonGenerator;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.Streams;
 import org.elasticsearch.common.xcontent.*;
diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java
index 1f5ae1343e2..016ef9f36c0 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java
@@ -19,8 +19,8 @@
 
 package org.elasticsearch.common.xcontent.json;
 
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 import org.elasticsearch.ElasticSearchIllegalStateException;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.common.xcontent.support.AbstractXContentParser;
diff --git a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java
index d120c0a3e1c..c9a3c1437dc 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java
@@ -19,9 +19,9 @@
 
 package org.elasticsearch.common.xcontent.smile;
 
-import org.codehaus.jackson.JsonEncoding;
-import org.codehaus.jackson.smile.SmileFactory;
-import org.codehaus.jackson.smile.SmileGenerator;
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.FastStringReader;
 import org.elasticsearch.common.xcontent.*;
diff --git a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java
index 53c703d5ca5..93ed86bdf20 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java
@@ -19,8 +19,8 @@
 
 package org.elasticsearch.common.xcontent.smile;
 
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.smile.SmileParser;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.dataformat.smile.SmileParser;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.common.xcontent.json.JsonXContentGenerator;
diff --git a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java
index 3269c1e72f8..2472bc28584 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentParser.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.common.xcontent.smile;
 
-import org.codehaus.jackson.JsonParser;
+import com.fasterxml.jackson.core.JsonParser;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.common.xcontent.json.JsonXContentParser;
 
diff --git a/src/test/java/org/elasticsearch/test/unit/deps/jackson/JacksonLocationTests.java b/src/test/java/org/elasticsearch/test/unit/deps/jackson/JacksonLocationTests.java
index 250705c8fe5..67b4228fd7e 100644
--- a/src/test/java/org/elasticsearch/test/unit/deps/jackson/JacksonLocationTests.java
+++ b/src/test/java/org/elasticsearch/test/unit/deps/jackson/JacksonLocationTests.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.test.unit.deps.jackson;
 
-import org.codehaus.jackson.*;
+import com.fasterxml.jackson.core.*;
 import org.elasticsearch.common.io.FastByteArrayOutputStream;
 import org.testng.annotations.Test;