diff --git a/jOOQ/src/main/java/org/jooq/SelectForStep.java b/jOOQ/src/main/java/org/jooq/SelectForStep.java
index d27144c9af..4c1ff9f649 100644
--- a/jOOQ/src/main/java/org/jooq/SelectForStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectForStep.java
@@ -131,6 +131,9 @@ public interface SelectForStep<R extends Record> extends SelectOptionStep<R> {
 
 
 
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index af1a725fe1..af51ea23a9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -1136,6 +1136,8 @@ final class ParserImpl implements Parser {
 
         forClause:
         if (parseKeywordIf(ctx, "FOR")) {
+            boolean jsonb;
+
             if (parseKeywordIf(ctx, "KEY SHARE"))
                 result.setForKeyShare(true);
             else if (parseKeywordIf(ctx, "NO KEY UPDATE"))
@@ -1180,7 +1182,8 @@ final class ParserImpl implements Parser {
 
 
             }
-            else if (parseKeywordIf(ctx, "JSON") && ctx.requireProEdition()) {
+            else if ((jsonb = parseKeywordIf(ctx, "JSONB") || parseKeywordIf(ctx, "JSON")) && ctx.requireProEdition()) {
+