diff --git a/ChangeLog b/ChangeLog
index 48527bcc0aca675a36f493db7d355e877b5022a5..12767c1dac8dccf8bec936e76ce6f86d9a3874d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-02  Jesper Öqvist <jesper.oqvist@cs.lth.se>
+
+    * Fixed repeated error message reported for multiple production rules for
+    a single nonterminal in the abstract grammar.
+
 2016-01-17  Jesper Öqvist <jesper.oqvist@cs.lth.se>
 
     * Added generated methods ASTNode.astChildren() and
diff --git a/build.gradle b/build.gradle
index 28e4f24de790e6f8822b9fb056111859524d0586..9a25103a6c8218fa5f67b88bb2d0805c0dffc2be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,7 +76,7 @@ repositories {
 
 dependencies {
 	compile 'org.apache.ant:ant:1.9.4'
-	jastadd('org.jastadd:jastadd:2.1.13') { force = true /* Avoid conflict with local artifact. */ }
+	jastadd('org.jastadd:jastadd:2.2.0') { force = true /* Avoid conflict with local artifact. */ }
 	javacc 'net.java.dev.javacc:javacc:4.0'
 }
 
diff --git a/tools/jastadd2.jar b/tools/jastadd2.jar
index cce0f46eac9f9e9201274b5c6ab6fc228ca41162..a5ceee397417663e640f353ca6f9c852509a4142 100644
Binary files a/tools/jastadd2.jar and b/tools/jastadd2.jar differ