diff --git a/0001-Port-to-current-javacc.patch b/0001-Port-to-current-javacc.patch
new file mode 100644
index 0000000..855eb39
--- /dev/null
+++ b/0001-Port-to-current-javacc.patch
@@ -0,0 +1,45 @@
+From f171cd8a95735c7f2fbcd20c323b2d936d8cc01b Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek@redhat.com>
+Date: Wed, 7 Sep 2016 16:36:53 +0200
+Subject: [PATCH] Port to current javacc
+
+---
+ src/main/java/org/apache/commons/jexl2/parser/SimpleNode.java  |  2 ++
+ .../java/org/apache/commons/jexl2/parser/TokenMgrError.java    | 10 ++++++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/src/main/java/org/apache/commons/jexl2/parser/SimpleNode.java b/src/main/java/org/apache/commons/jexl2/parser/SimpleNode.java
+index cab2378..4d83b1d 100644
+--- a/src/main/java/org/apache/commons/jexl2/parser/SimpleNode.java
++++ b/src/main/java/org/apache/commons/jexl2/parser/SimpleNode.java
+@@ -180,6 +180,8 @@ public class SimpleNode implements Node {
+             }
+         }
+     }
++
++    public int getId() { return id; }
+ }
+ 
+ /* JavaCC - OriginalChecksum=7dff880883d088a37c1e3197e4b455a0 (do not edit this line) */
+diff --git a/src/main/java/org/apache/commons/jexl2/parser/TokenMgrError.java b/src/main/java/org/apache/commons/jexl2/parser/TokenMgrError.java
+index 1e9b623..3e1236e 100644
+--- a/src/main/java/org/apache/commons/jexl2/parser/TokenMgrError.java
++++ b/src/main/java/org/apache/commons/jexl2/parser/TokenMgrError.java
+@@ -142,4 +142,14 @@ public class TokenMgrError extends Error {
+         current = curChar;
+         errorCode = reason;
+     }
++
++    public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) {
++        eof = EOFSeen;
++        state = lexState;
++        line = errorLine;
++        column = errorColumn;
++        after = errorAfter;
++        current = (char)curChar;
++        errorCode = reason;
++    }
+ }
+-- 
+2.7.4
+
diff --git a/apache-commons-jexl.spec b/apache-commons-jexl.spec
index 0532929..8daff4d 100644
--- a/apache-commons-jexl.spec
+++ b/apache-commons-jexl.spec
@@ -3,7 +3,7 @@
 
 Name:           apache-%{jarname}
 Version:        2.1.1
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Java Expression Language (JEXL)
 License:        ASL 2.0
 URL:            http://commons.apache.org/jexl
@@ -15,6 +15,7 @@ Source0:        http://www.apache.org/dist/commons/jexl/source/%{jarname}-%{vers
 Patch0:         001-Fix-tests.patch
 # Fix javadoc build
 Patch1:         apache-commons-jexl-javadoc.patch
+Patch2:         0001-Port-to-current-javacc.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(commons-logging:commons-logging)
@@ -41,7 +42,6 @@ needed Velocity-ish method access, it just had to have it.
 
 %package javadoc
 Summary:        Javadocs for %{name}
-Group:          Documentation
 Requires:       jpackage-utils
 Provides:       %{jarname}-javadoc = %{version}-%{release}
 
@@ -53,6 +53,8 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{jarname}-%{version}-src
 %patch0 -p1 -b .test
 %patch1 -p1 -b .javadoc
+%patch2 -p1
+
 # Java 1.6 contains bsf 3.0, so we don't need the dependency in the pom.xml file
 %pom_remove_dep org.apache.bsf:bsf-api
 find \( -name '*.jar' -o -name '*.class' \) -delete
@@ -93,6 +95,9 @@ echo "
 
 
 %changelog
+* Wed Sep 07 2016 Michael Simacek <msimacek@redhat.com> - 2.1.1-17
+- Port to current javacc
+
 * Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-16
 - Regenerate build-requires