diff --git a/herbstluftwm/usr/bin/hlwm-run-or-raise b/herbstluftwm/usr/bin/hlwm-run-or-raise
index 85d7389..0657088 100755
--- a/herbstluftwm/usr/bin/hlwm-run-or-raise
+++ b/herbstluftwm/usr/bin/hlwm-run-or-raise
@@ -1,4 +1,7 @@
-#!/usr/bin/scsh -s
+#!/usr/bin/env sh
+# # -*- mode: scheme; -*-
+IFS=" "
+exec scsh -s "$0" "$@"
 !#
 ;; hlwm-run-or-raise --- Raise a window or start a new process
 ;;
diff --git a/herbstluftwm/usr/bin/hlwm-switch-tags b/herbstluftwm/usr/bin/hlwm-switch-tags
index 06a10d2..f741ed8 100755
--- a/herbstluftwm/usr/bin/hlwm-switch-tags
+++ b/herbstluftwm/usr/bin/hlwm-switch-tags
@@ -1,5 +1,7 @@
-#!/usr/bin/scsh \
--o define-record-types -s
+#!/usr/bin/env sh
+# -*- mode: scheme; -*-
+IFS=" "
+exec scsh -o define-record-types -s "$0" "$@"
 !#
 ;; hlwm-switch-tags --- Switch the currently visible tags
 ;;
diff --git a/polybar/usr/bin/count-emails b/polybar/usr/bin/count-emails
index 98a2573..787d69d 100755
--- a/polybar/usr/bin/count-emails
+++ b/polybar/usr/bin/count-emails
@@ -1,5 +1,7 @@
-#!/usr/bin/env -S scsh -s
-;; -*- mode: scheme; -*-
+#!/usr/bin/env sh
+# -*- mode: scheme; -*-
+IFS=" "
+exec scsh -s "$0" "$@"
 !#
 
 (define mail-root (string-append (getenv "HOME") "/documents/mail"))