diff --git a/jOOQ/src/main/java/org/jooq/SelectForUpdateWaitStep.java b/jOOQ/src/main/java/org/jooq/SelectForUpdateWaitStep.java
index f895e3f457..634c1992c6 100644
--- a/jOOQ/src/main/java/org/jooq/SelectForUpdateWaitStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectForUpdateWaitStep.java
@@ -38,6 +38,7 @@
 package org.jooq;
 
 // ...
+import static org.jooq.SQLDialect.MARIADB;
 import static org.jooq.SQLDialect.MYSQL;
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
@@ -105,19 +106,16 @@ import static org.jooq.SQLDialect.POSTGRES;
  */
 public interface SelectForUpdateWaitStep<R extends Record> extends SelectOptionStep<R> {
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+    /**
+     * Add a <code>WAIT</code> clause to the <code>FOR UPDATE</code> clause at
+     * the end of the query.
+     * <p>
+     * Be careful not to confuse this with {@link Object#wait(long)} !
+     *
+     * @see SelectQuery#setForUpdateWait(int) see LockProvider for more details
+     */
+    @Support({ MARIADB })
+    SelectOptionStep<R> wait(int seconds);
 
     /**
      * Add a <code>NOWAIT</code> clause to the <code>FOR UPDATE</code> clause at
@@ -125,7 +123,7 @@ public interface SelectForUpdateWaitStep<R extends Record> extends SelectOptionS
      *
      * @see SelectQuery#setForUpdateNoWait() see LockProvider for more details
      */
-    @Support({ MYSQL, POSTGRES })
+    @Support({ MARIADB, MYSQL, POSTGRES })
     SelectOptionStep<R> noWait();
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/SelectQuery.java b/jOOQ/src/main/java/org/jooq/SelectQuery.java
index 321ada3a55..d5fe04a41c 100644
--- a/jOOQ/src/main/java/org/jooq/SelectQuery.java
+++ b/jOOQ/src/main/java/org/jooq/SelectQuery.java
@@ -53,6 +53,7 @@ import static org.jooq.SQLDialect.HSQLDB;
 // ...
 import static org.jooq.SQLDialect.MARIADB;
 // ...
+// ...
 import static org.jooq.SQLDialect.MYSQL;
 // ...
 // ...
@@ -990,27 +991,24 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
     @Support({ DERBY, FIREBIRD, H2, HSQLDB, MYSQL, POSTGRES })
     void setForUpdateOf(Table<?>... tables);
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    /**
+     * Some RDBMS allow for specifying the locking mode for the applied
+     * <code>FOR UPDATE</code> clause. In this case, the session will wait for
+     * some <code>seconds</code>, before aborting the lock acquirement if the
+     * lock is not available.
+     * <p>
+     * This automatically sets the {@link #setForUpdate(boolean)} flag, and
+     * unsets the {@link #setForShare(boolean)} flag, if it was previously set.
+     * <p>
+     * This has been observed to be supported by any of these dialects:
+     * <ul>
+     * <li>Oracle</li>
+     * </ul>
+     *
+     * @param seconds The number of seconds to wait for a lock
+     */
+    @Support({ MARIADB })
+    void setForUpdateWait(int seconds);
 
     /**
      * Some RDBMS allow for specifying the locking mode for the applied
@@ -1025,7 +1023,7 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
      * <li>Oracle</li>
      * </ul>
      */
-    @Support({ MYSQL, POSTGRES })
+    @Support({ MARIADB, MYSQL, POSTGRES })
     void setForUpdateNoWait();
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
index 422880a4ae..6df5af239d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
@@ -1788,14 +1788,11 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
         return this;
     }
 
-
-
-
-
-
-
-
-
+    @Override
+    public final SelectImpl wait(int seconds) {
+        getQuery().setForUpdateWait(seconds);
+        return this;
+    }
 
     @Override
     public final SelectImpl noWait() {
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 60305d3945..d32b44ad47 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -1981,15 +1981,12 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
         forUpdateOfTables = new TableList(Arrays.asList(tables));
     }
 
-
-
-
-
-
-
-
-
-
+    @Override
+    public final void setForUpdateWait(int seconds) {
+        setForUpdate(true);
+        forUpdateWaitMode = ForUpdateWaitMode.WAIT;
+        forUpdateWait = seconds;
+    }
 
     @Override
     public final void setForUpdateNoWait() {