diff --git a/pom.xml b/pom.xml
index 1a319aa11d6..a6cc885c441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,8 @@
 
     <properties>
         <elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
-        <lucene.version>4.10.2</lucene.version>
+        <lucene.version>5.0.0</lucene.version>
+        <lucene.maven.version>5.0.0-snapshot-1636426</lucene.maven.version>
         <tests.jvms>1</tests.jvms>
         <tests.shuffle>true</tests.shuffle>
         <tests.output>onerror</tests.output>
@@ -46,6 +47,10 @@
             <id>sonatype</id>
             <url>http://oss.sonatype.org/content/repositories/releases/</url>
         </repository>
+        <repository>
+            <id>Lucene snapshots</id>
+            <url>https://download.elasticsearch.org/lucenesnapshots/maven/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -64,7 +69,7 @@
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-test-framework</artifactId>
-            <version>${lucene.version}</version>
+            <version>${lucene.maven.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -78,7 +83,7 @@
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-analyzers-smartcn</artifactId>
-            <version>${lucene.version}</version>
+            <version>${lucene.maven.version}</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/src/main/java/org/elasticsearch/index/analysis/SmartChineseTokenizerTokenizerFactory.java b/src/main/java/org/elasticsearch/index/analysis/SmartChineseTokenizerTokenizerFactory.java
index a00e2bbabfb..e73e72f2493 100644
--- a/src/main/java/org/elasticsearch/index/analysis/SmartChineseTokenizerTokenizerFactory.java
+++ b/src/main/java/org/elasticsearch/index/analysis/SmartChineseTokenizerTokenizerFactory.java
@@ -37,7 +37,7 @@ public class SmartChineseTokenizerTokenizerFactory extends AbstractTokenizerFact
     }
 
     @Override
-    public Tokenizer create(Reader reader) {
-        return new HMMChineseTokenizer(reader);
+    public Tokenizer create() {
+        return new HMMChineseTokenizer();
     }
 }
diff --git a/src/main/java/org/elasticsearch/indices/analysis/smartcn/SmartChineseIndicesAnalysis.java b/src/main/java/org/elasticsearch/indices/analysis/smartcn/SmartChineseIndicesAnalysis.java
index 3c98f34d23f..78a9934fc5a 100644
--- a/src/main/java/org/elasticsearch/indices/analysis/smartcn/SmartChineseIndicesAnalysis.java
+++ b/src/main/java/org/elasticsearch/indices/analysis/smartcn/SmartChineseIndicesAnalysis.java
@@ -52,8 +52,8 @@ public class SmartChineseIndicesAnalysis extends AbstractComponent {
             }
 
             @Override
-            public Tokenizer create(Reader reader) {
-                return new HMMChineseTokenizer(reader);
+            public Tokenizer create() {
+                return new HMMChineseTokenizer();
             }
         }));
 
@@ -65,8 +65,8 @@ public class SmartChineseIndicesAnalysis extends AbstractComponent {
             }
 
             @Override
-            public Tokenizer create(Reader reader) {
-                return new HMMChineseTokenizer(reader);
+            public Tokenizer create() {
+                return new HMMChineseTokenizer();
             }
         }));