diff --git a/recipes-extended/tmux/files/tmux.conf b/recipes-extended/tmux/files/tmux.conf
new file mode 100644
index 00000000..76fa6318
--- /dev/null
+++ b/recipes-extended/tmux/files/tmux.conf
@@ -0,0 +1,3 @@
+set -g lock-command vlock
+bind X lock-session
+source-file -q /usr/share/tmux/conf.d/*
diff --git a/recipes-extended/tmux/tmux_3.%.bbappend b/recipes-extended/tmux/tmux_3.%.bbappend
new file mode 100644
index 00000000..bb808ea1
--- /dev/null
+++ b/recipes-extended/tmux/tmux_3.%.bbappend
@@ -0,0 +1,15 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI += "\
+    file://tmux.conf \
+"
+
+do_install:append() {
+    install -d ${D}${sysconfdir}
+    install -m 644 ${WORKDIR}/tmux.conf ${D}${sysconfdir}/tmux.conf
+    install -d ${D}/usr/share/tmux/conf.d
+}
+
+FILES:${PN}     += "${sysconfdir}/tmux.conf"
+CONFFILES:${PN} += "${sysconfdir}/tmux.conf"
+RDEPENDS:${PN}:append = " vlock"