diff --git a/core/src/main/java/cucumber/formatter/HTMLFormatter.java b/core/src/main/java/cucumber/formatter/HTMLFormatter.java
index 29f51e65aa..2fc1fcc7dc 100644
--- a/core/src/main/java/cucumber/formatter/HTMLFormatter.java
+++ b/core/src/main/java/cucumber/formatter/HTMLFormatter.java
@@ -97,7 +97,7 @@ public void eof() {
     }
 
     @Override
-    public void syntaxError(String state, String event, List<String> legalEvents, String uri, int line) {
+    public void syntaxError(String state, String event, List<String> legalEvents, String uri, Integer line) {
     }
 
     @Override
diff --git a/core/src/main/java/cucumber/formatter/JUnitFormatter.java b/core/src/main/java/cucumber/formatter/JUnitFormatter.java
index c0ad0248e8..73792c4945 100644
--- a/core/src/main/java/cucumber/formatter/JUnitFormatter.java
+++ b/core/src/main/java/cucumber/formatter/JUnitFormatter.java
@@ -141,7 +141,7 @@ public void eof() {
     }
 
     @Override
-    public void syntaxError(String state, String event, List<String> legalEvents, String uri, int line) {
+    public void syntaxError(String state, String event, List<String> legalEvents, String uri, Integer line) {
     }
 
     private static class TestCase {
diff --git a/core/src/main/java/cucumber/formatter/NullFormatter.java b/core/src/main/java/cucumber/formatter/NullFormatter.java
index 4e2e35ffb2..9c00875906 100644
--- a/core/src/main/java/cucumber/formatter/NullFormatter.java
+++ b/core/src/main/java/cucumber/formatter/NullFormatter.java
@@ -47,7 +47,7 @@ public void eof() {
     }
 
     @Override
-    public void syntaxError(String state, String event, List<String> legalEvents, String uri, int line) {
+    public void syntaxError(String state, String event, List<String> legalEvents, String uri, Integer line) {
     }
 
     @Override
diff --git a/core/src/main/java/cucumber/formatter/ProgressFormatter.java b/core/src/main/java/cucumber/formatter/ProgressFormatter.java
index 9ce469edd0..c0ad895a39 100644
--- a/core/src/main/java/cucumber/formatter/ProgressFormatter.java
+++ b/core/src/main/java/cucumber/formatter/ProgressFormatter.java
@@ -74,7 +74,7 @@ public void eof() {
     }
 
     @Override
-    public void syntaxError(String state, String event, List<String> legalEvents, String uri, int line) {
+    public void syntaxError(String state, String event, List<String> legalEvents, String uri, Integer line) {
     }
 
     @Override
diff --git a/core/src/main/java/cucumber/formatter/UsageFormatter.java b/core/src/main/java/cucumber/formatter/UsageFormatter.java
index e1eeb0cc78..f9df5d8e7f 100644
--- a/core/src/main/java/cucumber/formatter/UsageFormatter.java
+++ b/core/src/main/java/cucumber/formatter/UsageFormatter.java
@@ -89,7 +89,7 @@ public void eof() {
     }
 
     @Override
-    public void syntaxError(String state, String event, List<String> legalEvents, String uri, int line) {
+    public void syntaxError(String state, String event, List<String> legalEvents, String uri, Integer line) {
     }
 
     @Override
diff --git a/core/src/main/java/cucumber/runtime/FeatureBuilder.java b/core/src/main/java/cucumber/runtime/FeatureBuilder.java
index ef801e7061..82d395b20c 100644
--- a/core/src/main/java/cucumber/runtime/FeatureBuilder.java
+++ b/core/src/main/java/cucumber/runtime/FeatureBuilder.java
@@ -82,7 +82,7 @@ public void eof() {
     }
 
     @Override
-    public void syntaxError(String state, String event, List<String> legalEvents, String uri, int line) {
+    public void syntaxError(String state, String event, List<String> legalEvents, String uri, Integer line) {
     }
 
     @Override
diff --git a/core/src/test/java/cucumber/formatter/TestFormatter.java b/core/src/test/java/cucumber/formatter/TestFormatter.java
index c8cdd91b60..9be4b9a371 100644
--- a/core/src/test/java/cucumber/formatter/TestFormatter.java
+++ b/core/src/test/java/cucumber/formatter/TestFormatter.java
@@ -66,7 +66,7 @@ public void eof() {
     }
 
     @Override
-    public void syntaxError(String state, String event, List<String> legalEvents, String uri, int line) {
+    public void syntaxError(String state, String event, List<String> legalEvents, String uri, Integer line) {
         throw new UnsupportedOperationException();
     }
 
diff --git a/core/src/test/java/cucumber/runtime/JdkPatternArgumentMatcherTest.java b/core/src/test/java/cucumber/runtime/JdkPatternArgumentMatcherTest.java
index 607c43e557..1b00e527c6 100644
--- a/core/src/test/java/cucumber/runtime/JdkPatternArgumentMatcherTest.java
+++ b/core/src/test/java/cucumber/runtime/JdkPatternArgumentMatcherTest.java
@@ -30,7 +30,7 @@ public void shouldDealWithUnicodeEverywhere() throws UnsupportedEncodingExceptio
         assertVariables("Jæ (.+) ålsker (.+) lændet", "Jæ vø ålsker døtte lændet", "vø", 3, "døtte", 13);
     }
 
-    private void assertVariables(String regex, String string, String v1, int pos1, String v2, int pos2) throws UnsupportedEncodingException {
+    private void assertVariables(String regex, String string, String v1, Integer pos1, String v2, Integer pos2) throws UnsupportedEncodingException {
         List<Argument> args = new JdkPatternArgumentMatcher(Pattern.compile(regex)).argumentsFrom(string);
         assertEquals(2, args.size());
         assertEquals(v1, args.get(0).getVal());
diff --git a/core/src/test/java/cucumber/table/TableParser.java b/core/src/test/java/cucumber/table/TableParser.java
index 641a56bf73..c56c4ff5c7 100644
--- a/core/src/test/java/cucumber/table/TableParser.java
+++ b/core/src/test/java/cucumber/table/TableParser.java
@@ -19,52 +19,52 @@ public static DataTable parse(String source) {
         final List<DataTableRow> rows = new ArrayList<DataTableRow>();
         Lexer l = new EN(new Listener() {
             @Override
-            public void comment(String comment, int line) {
+            public void comment(String comment, Integer line) {
                 throw new UnsupportedOperationException();
             }
 
             @Override
-            public void tag(String tag, int line) {
+            public void tag(String tag, Integer line) {
                 throw new UnsupportedOperationException();
             }
 
             @Override
-            public void feature(String keyword, String name, String description, int line) {
+            public void feature(String keyword, String name, String description, Integer line) {
                 throw new UnsupportedOperationException();
             }
 
             @Override
-            public void background(String keyword, String name, String description, int line) {
+            public void background(String keyword, String name, String description, Integer line) {
                 throw new UnsupportedOperationException();
             }
 
             @Override
-            public void scenario(String keyword, String name, String description, int line) {
+            public void scenario(String keyword, String name, String description, Integer line) {
                 throw new UnsupportedOperationException();
             }
 
             @Override
-            public void scenarioOutline(String keyword, String name, String description, int line) {
+            public void scenarioOutline(String keyword, String name, String description, Integer line) {
                 throw new UnsupportedOperationException();
             }
 
             @Override
-            public void examples(String keyword, String name, String description, int line) {
+            public void examples(String keyword, String name, String description, Integer line) {
                 throw new UnsupportedOperationException();
             }
 
             @Override
-            public void step(String keyword, String name, int line) {
+            public void step(String keyword, String name, Integer line) {
                 throw new UnsupportedOperationException();
             }
 
             @Override
-            public void row(List<String> cells, int line) {
+            public void row(List<String> cells, Integer line) {
                 rows.add(new DataTableRow(NO_COMMENTS, cells, line));
             }
 
             @Override
-            public void docString(String contentType, String string, int line) {
+            public void docString(String contentType, String string, Integer line) {
                 throw new UnsupportedOperationException();
             }
 
diff --git a/junit/src/main/java/cucumber/junit/JUnitReporter.java b/junit/src/main/java/cucumber/junit/JUnitReporter.java
index 136a9f2e2c..e34f45865a 100644
--- a/junit/src/main/java/cucumber/junit/JUnitReporter.java
+++ b/junit/src/main/java/cucumber/junit/JUnitReporter.java
@@ -165,7 +165,7 @@ public void eof() {
     }
 
     @Override
-    public void syntaxError(String state, String event, List<String> legalEvents, String uri, int line) {
+    public void syntaxError(String state, String event, List<String> legalEvents, String uri, Integer line) {
         formatter.syntaxError(state, event, legalEvents, uri, line);
     }
 
diff --git a/pom.xml b/pom.xml
index 30b055d6cf..d710d28908 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <outputDirectory>${project.build.directory}</outputDirectory>
-        <gherkin.version>2.9.3</gherkin.version>
+        <gherkin.version>2.10.0</gherkin.version>
         <groovy.version>2.0.0-beta-2</groovy.version>
     </properties>
     <licenses>