diff --git a/recipes-core/images/netmodule-linux-image-dev.bb b/recipes-core/images/netmodule-linux-image-dev.bb
index ef06964..5340ecd 100644
--- a/recipes-core/images/netmodule-linux-image-dev.bb
+++ b/recipes-core/images/netmodule-linux-image-dev.bb
@@ -53,5 +53,6 @@ IMAGE_INSTALL_append = " \
                 evtest \
                 devmem2 \
                 board-descriptor \
+                tmate \
                 "
 OSTREE_BRANCHNAME = "${MACHINE}-dev"
diff --git a/recipes-extended/tmate/tmate.bb b/recipes-extended/tmate/tmate.bb
new file mode 100644
index 0000000..89101b5
--- /dev/null
+++ b/recipes-extended/tmate/tmate.bb
@@ -0,0 +1,26 @@
+SUMMARY = "Instant terminal sharing"
+HOMEPAGE = "https://tmate.io/"
+SECTION = "console/utils"
+
+LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf19144bdaca107"
+
+DEPENDS = "ncurses libevent msgpack-c libssh"
+
+SRC_URI = "https://github.com/tmate-io/tmate/archive/2.2.1.tar.gz"
+
+SRC_URI[md5sum] = "b4d87221d76f7d12e6771897b5940902"
+SRC_URI[sha256sum] = "d9c2ac59f42e65aac5f500f0548ea8056fd79c9c5285e5af324d833e2a84c305"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/tmate-2.2.1"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter,"
+
+do_configure_prepend() {
+    # The 'compat' directory is needed for output during the build but it's
+    # not automatically created when building outside the source directory.
+    mkdir ${B}/compat
+}
+