diff --git a/bin/kafka-e2e-latency.sh b/bin/kafka-e2e-latency.sh
new file mode 100755
index 00000000000..32d1063ec5d
--- /dev/null
+++ b/bin/kafka-e2e-latency.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.tools.EndToEndLatency "$@"
diff --git a/bin/windows/kafka-e2e-latency.bat b/bin/windows/kafka-e2e-latency.bat
new file mode 100644
index 00000000000..c26545d43e6
--- /dev/null
+++ b/bin/windows/kafka-e2e-latency.bat
@@ -0,0 +1,17 @@
+@echo off
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements.  See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License.  You may obtain a copy of the License at
+rem
+rem     http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
+"%~dp0kafka-run-class.bat" org.apache.kafka.tools.EndToEndLatency %*
diff --git a/core/src/main/scala/kafka/tools/EndToEndLatency.scala b/core/src/main/scala/kafka/tools/EndToEndLatency.scala
new file mode 100644
index 00000000000..28933ca692b
--- /dev/null
+++ b/core/src/main/scala/kafka/tools/EndToEndLatency.scala
@@ -0,0 +1,30 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package kafka.tools
+
+@deprecated(since = "3.5")
+object EndToEndLatency {
+  def main(args: Array[String]): Unit = {
+    println("WARNING: The 'kafka.tools' package is deprecated and will change to 'org.apache.kafka.tools' in the next major release.")
+    val toolClass = Class.forName("org.apache.kafka.tools.EndToEndLatency")
+    val toolMethod = toolClass.getDeclaredMethod("main", classOf[Array[String]])
+    toolMethod.invoke(null, args)
+  }
+}
diff --git a/docs/upgrade.html b/docs/upgrade.html
index 15ddca52078..ff5d8797ba9 100644
--- a/docs/upgrade.html
+++ b/docs/upgrade.html
@@ -34,7 +34,7 @@
             This new setting is marked deprecated and will be removed in the next major release when incrementalAlterConfigs API is always used.
             See <a href="https://cwiki.apache.org/confluence/display/KAFKA/KIP-894%3A+Use+incrementalAlterConfigs+API+for+syncing+topic+configurations">KIP-894</a> for more details.
         </li>
-        <li>The JmxTool has been migrated to the tools module.
+        <li>The JmxTool and EndToEndLatency tools have been migrated to the tools module.
             The 'kafka.tools' package is deprecated and will change to 'org.apache.kafka.tools' in the next major release.
             See <a href="https://issues.apache.org/jira/browse/KAFKA-14525">KAFKA-14525</a> for more details.
         </li>