diff --git a/recipes-musicians/linuxaudio/new-session-manager.bb b/recipes-musicians/linuxaudio/new-session-manager.bb
index 52f6e21..3d4ac8a 100644
--- a/recipes-musicians/linuxaudio/new-session-manager.bb
+++ b/recipes-musicians/linuxaudio/new-session-manager.bb
@@ -17,3 +17,5 @@ S = "${WORKDIR}/git"
 
 inherit meson gtk-icon-cache
 
+RCONFLICTS_${PN} = "non-session-manager"
+RREPLACES_${PN} = "non-session-manager"
diff --git a/recipes-musicians/non/non.bb b/recipes-musicians/non/non.bb
index e89fd25..7a38527 100644
--- a/recipes-musicians/non/non.bb
+++ b/recipes-musicians/non/non.bb
@@ -41,3 +41,18 @@ do_configure_prepend() {
 }
 
 FILES_${PN} += "${datadir}/non-sequencer"
+
+PACKAGES =+ "${PN}-session-manager"
+FILES_${PN}-session-manager = " \
+    ${datadir}/applications/non-session-manager.desktop \
+    ${datadir}/icons/hicolor/*/apps/non-session-manager.png \
+    ${datadir}/pixmaps/non-session-manager \
+    ${bindir}/jackpatch \
+    ${bindir}/non-session-manager \
+    ${bindir}/nsm-proxy \
+    ${bindir}/nsm-proxy-gui \
+    ${bindir}/nsmd \
+"
+
+RCONFLICTS_${PN}-session-manager = "new-session-manager"
+RREPLACES_${PN}-session-manager = "new-session-manager"