diff --git a/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java
index 5d89a4f18c..0bb2fbddbf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java
@@ -264,7 +264,7 @@ extends
             case MARIADB:
             case MYSQL:
             case POSTGRES:
-                ctx.visit(N_BIT_AND);
+                ctx.visit(N_BIT_OR);
                 break;
 
             default:
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java
index cfbd16e287..f6d2ab4a10 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java
@@ -271,7 +271,7 @@ extends
             case MARIADB:
             case MYSQL:
             case POSTGRES:
-                ctx.visit(N_BIT_AND);
+                ctx.visit(N_BIT_XOR);
                 break;
 
             default:
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 6a1d22f7f9..293bcd1a98 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -7980,15 +7980,25 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
 
         char c1 = character(p + 1);
         char c2 = character(p + 2);
+        boolean agg = false;
 
         if (c1 != 'I' && c1 != 'i')
             return null;
         if (c2 != 'T' && c2 != 't' && c2 != 'N' && c2 != 'n')
             return null;
 
-        if (parseKeywordIf("BIT_AND") || parseKeywordIf("BITAND") || parseKeywordIf("BIN_AND")) {
+        if (parseKeywordIf("BIT_AND") ||
+            parseKeywordIf("BITAND") ||
+            parseKeywordIf("BIN_AND") ||
+            (agg = parseKeywordIf("BIT_AND_AGG")) ||
+            (agg = parseKeywordIf("BITAND_AGG")) ||
+            (agg = parseKeywordIf("BIN_AND_AGG"))) {
             parse('(');
             Field<?> x = toField(parseNumericOp(N));
+
+            if (agg && parse(')') || parseIf(')'))
+                return parseAggregateFunctionIf(false, bitAndAgg((Field) x));
+
             parse(',');
             Field<?> y = toField(parseNumericOp(N));
             parse(')');
@@ -8004,9 +8014,18 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
 
             return bitNand((Field) x, (Field) y);
         }
-        else if (parseKeywordIf("BIT_OR") || parseKeywordIf("BITOR") || parseKeywordIf("BIN_OR")) {
+        else if (parseKeywordIf("BIT_OR") ||
+            parseKeywordIf("BITOR") ||
+            parseKeywordIf("BIN_OR") ||
+            (agg = parseKeywordIf("BIT_OR_AGG")) ||
+            (agg = parseKeywordIf("BITOR_AGG")) ||
+            (agg = parseKeywordIf("BIN_OR_AGG"))) {
             parse('(');
             Field<?> x = toField(parseNumericOp(N));
+
+            if (agg && parse(')') || parseIf(')'))
+                return parseAggregateFunctionIf(false, bitOrAgg((Field) x));
+
             parse(',');
             Field<?> y = toField(parseNumericOp(N));
             parse(')');
@@ -8022,9 +8041,18 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
 
             return bitNor((Field) x, (Field) y);
         }
-        else if (parseKeywordIf("BIT_XOR") || parseKeywordIf("BITXOR") || parseKeywordIf("BIN_XOR")) {
+        else if (parseKeywordIf("BIT_XOR") ||
+            parseKeywordIf("BITXOR") ||
+            parseKeywordIf("BIN_XOR") ||
+            (agg = parseKeywordIf("BIT_XOR_AGG")) ||
+            (agg = parseKeywordIf("BITXOR_AGG")) ||
+            (agg = parseKeywordIf("BIN_XOR_AGG"))) {
             parse('(');
             Field<?> x = toField(parseNumericOp(N));
+
+            if (agg && parse(')') || parseIf(')'))
+                return parseAggregateFunctionIf(false, bitXorAgg((Field) x));
+
             parse(',');
             Field<?> y = toField(parseNumericOp(N));
             parse(')');
@@ -10281,6 +10309,10 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
     }
 
     private final Field<?> parseAggregateFunctionIf(boolean basic) {
+        return parseAggregateFunctionIf(basic, null);
+    }
+
+    private final Field<?> parseAggregateFunctionIf(boolean basic, AggregateFunction<?> f) {
         AggregateFunction<?> agg = null;
         AggregateFilterStep<?> filter = null;
         WindowBeforeOverStep<?> over = null;
@@ -10288,7 +10320,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
         Field<?> result = null;
         Condition condition = null;
 
-        keep = over = filter = agg = parseCountIf();
+        keep = over = filter = agg = f != null ? f : parseCountIf();
         if (filter == null) {
             Field<?> field = parseGeneralSetFunctionIf();