diff --git a/Documentation/cmd-ls-projects.txt b/Documentation/cmd-ls-projects.txt
index ebd365a..72e7630 100644
--- a/Documentation/cmd-ls-projects.txt
+++ b/Documentation/cmd-ls-projects.txt
@@ -16,6 +16,10 @@
   [--limit <N>]
   [--prefix | -p <prefix>]
   [--has-acl-for GROUP]
+  [--match | -m]
+  [-r REGEX]
+  [--start | -S]
+  [--state | -s ]
 --
 
 == DESCRIPTION
@@ -58,6 +62,22 @@
 	Displays project inheritance in a tree-like format.
 	This option does not work together with the show-branch option.
 
+--match::
+-m
+  Match project substring
+
+-r::
+  Match project regex
+
+--start::
+-S::
+  Number of projects to skip
+
+--state::
+-s::
+  Filter by project state. [ACTIVE | READON_ONLY | HIDDEN]
+
+
 [NOTE]
 If the calling user does not meet any of the following criteria:
 
diff --git a/java/com/google/gerrit/sshd/SshDaemon.java b/java/com/google/gerrit/sshd/SshDaemon.java
index cc35a32..af7d22b 100644
--- a/java/com/google/gerrit/sshd/SshDaemon.java
+++ b/java/com/google/gerrit/sshd/SshDaemon.java
@@ -77,6 +77,7 @@
 import org.apache.sshd.common.forward.DefaultForwarderFactory;
 import org.apache.sshd.common.future.CloseFuture;
 import org.apache.sshd.common.future.SshFutureListener;
+import org.apache.sshd.common.global.KeepAliveHandler;
 import org.apache.sshd.common.io.AbstractIoServiceFactory;
 import org.apache.sshd.common.io.IoAcceptor;
 import org.apache.sshd.common.io.IoServiceFactory;
@@ -109,7 +110,6 @@
 import org.apache.sshd.server.command.CommandFactory;
 import org.apache.sshd.server.forward.ForwardingFilter;
 import org.apache.sshd.server.global.CancelTcpipForwardHandler;
-import org.apache.sshd.server.global.KeepAliveHandler;
 import org.apache.sshd.server.global.NoMoreSessionsHandler;
 import org.apache.sshd.server.global.TcpipForwardHandler;
 import org.apache.sshd.server.session.ServerSessionImpl;
diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index 9f9b1b5..562b072 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -115,18 +115,18 @@
         sha1 = "cb2f351bf4463751201f43bb99865235d5ba07ca",
     )
 
-    SSHD_VERS = "2.10.0"
+    SSHD_VERS = "2.12.0"
 
     maven_jar(
         name = "sshd-osgi",
         artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS,
-        sha1 = "03677ac1da780b7bdb682da50b762d79ea0d940d",
+        sha1 = "32b8de1cbb722ba75bdf9898e0c41d42af00ce57",
     )
 
     maven_jar(
         name = "sshd-sftp",
         artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS,
-        sha1 = "88707339ac0693d48df0ec1bafb84c78d792ed08",
+        sha1 = "0f96f00a07b186ea62838a6a4122e8f4cad44df6",
     )
 
     maven_jar(
@@ -144,7 +144,7 @@
     maven_jar(
         name = "sshd-mina",
         artifact = "org.apache.sshd:sshd-mina:" + SSHD_VERS,
-        sha1 = "b1f77377fbc517400e7665d0b2c83b58b41aa45d",
+        sha1 = "8b202f7d4c0d7b714fd0c93a1352af52aa031149",
     )
 
     maven_jar(