diff --git a/src/musikcube/musikcube.in b/src/musikcube/musikcube.in
index d80c7368c..31482554a 100644
--- a/src/musikcube/musikcube.in
+++ b/src/musikcube/musikcube.in
@@ -1,5 +1,6 @@
-#!/usr/bin/env bash
-pushd @musikcube_INSTALL_DIR@/share/musikcube/ > /dev/null
-{
-  ./musikcube "$@" && popd
-} || popd > /dev/null
+#!/bin/sh
+
+set -eu
+
+cd "@musikcube_INSTALL_DIR@"/share/musikcube/
+exec ./musikcube "$@"
diff --git a/src/musikcubed/musikcubed.in b/src/musikcubed/musikcubed.in
index 447ad6036..8b65bc32a 100644
--- a/src/musikcubed/musikcubed.in
+++ b/src/musikcubed/musikcubed.in
@@ -1,5 +1,6 @@
-#!/usr/bin/env bash
-pushd @musikcube_INSTALL_DIR@/share/musikcube/ > /dev/null
-{
-  ./musikcubed "$@" && popd
-} || popd > /dev/null
+#!/bin/sh
+
+set -eu
+
+cd "@musikcube_INSTALL_DIR@"/share/musikcube/
+exec ./musikcubed "$@"