diff --git a/scripts/PROGRAM b/scripts/PROGRAM
index 3511ccdfc..69a655949 100755
--- a/scripts/PROGRAM
+++ b/scripts/PROGRAM
@@ -1,7 +1,7 @@
 #!/bin/sh
 # aside from this initial boilerplate, this is actually -*- scheme -*- code
 main='(module-ref (resolve-module '\''(scripts PROGRAM)) '\'main')'
-exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
 !#
 ;;; PROGRAM --- Does something
 
diff --git a/scripts/README b/scripts/README
index c1a3ef998..56dd286fb 100644
--- a/scripts/README
+++ b/scripts/README
@@ -65,7 +65,7 @@ Programs must follow the "executable module" convention, documented here:
 
   #!/bin/sh
   main='(module-ref (resolve-module '\''(scripts PROGRAM)) '\'main')'
-  exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
+  exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
   !#
 
 Following these conventions allows the program file to be used as module
diff --git a/scripts/display-commentary b/scripts/display-commentary
index 1eeb842d8..21ce2c03a 100755
--- a/scripts/display-commentary
+++ b/scripts/display-commentary
@@ -1,7 +1,7 @@
 #!/bin/sh
 # aside from this initial boilerplate, this is actually -*- scheme -*- code
 main='(module-ref (resolve-module '\''(scripts display-commentary)) '\'main')'
-exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
 !#
 ;;; display-commentary --- As advertized
 
diff --git a/scripts/doc-snarf b/scripts/doc-snarf
index 941682e78..5b72fc5f8 100755
--- a/scripts/doc-snarf
+++ b/scripts/doc-snarf
@@ -1,7 +1,7 @@
 #!/bin/sh
 # aside from this initial boilerplate, this is actually -*- scheme -*- code
 main='(module-ref (resolve-module '\''(scripts doc-snarf)) '\'main')'
-exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
 !#
 ;;; doc-snarf --- Extract documentation from source files
 
diff --git a/scripts/generate-autoload b/scripts/generate-autoload
index 83fa1f3f2..942822ead 100755
--- a/scripts/generate-autoload
+++ b/scripts/generate-autoload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # aside from this initial boilerplate, this is actually -*- scheme -*- code
 main='(module-ref (resolve-module '\''(scripts generate-autoload)) '\'main')'
-exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
 !#
 ;;; generate-autoload --- Display define-module form with autoload info
 
diff --git a/scripts/punify b/scripts/punify
index 1cc318fb6..699f3e2ff 100755
--- a/scripts/punify
+++ b/scripts/punify
@@ -1,7 +1,7 @@
 #!/bin/sh
 # aside from this initial boilerplate, this is actually -*- scheme -*- code
 main='(module-ref (resolve-module '\''(scripts punify)) '\'main')'
-exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
 !#
 ;;; punify --- Display Scheme code w/o unnecessary comments / whitespace
 
diff --git a/scripts/read-scheme-source b/scripts/read-scheme-source
index 48e96058a..1a9c0e59b 100755
--- a/scripts/read-scheme-source
+++ b/scripts/read-scheme-source
@@ -1,7 +1,7 @@
 #!/bin/sh
 # aside from this initial boilerplate, this is actually -*- scheme -*- code
 main='(module-ref (resolve-module '\''(scripts read-scheme-source)) '\'main')'
-exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
 !#
 ;;; read-scheme-source --- Read a file, recognizing scheme forms and comments
 
diff --git a/scripts/snarf-check-and-output-texi b/scripts/snarf-check-and-output-texi
index e3c84f540..bc1287b38 100755
--- a/scripts/snarf-check-and-output-texi
+++ b/scripts/snarf-check-and-output-texi
@@ -1,7 +1,7 @@
 #!/bin/sh
 # aside from this initial boilerplate, this is actually -*- scheme -*- code
 main="(module-ref (resolve-module '(scripts snarf-check-and-output-texi)) 'main)"
-exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
 !#
 ;;; snarf-check-and-output-texi --- called by the doc snarfer.
 
diff --git a/scripts/use2dot b/scripts/use2dot
index d2cb64695..6f2901107 100755
--- a/scripts/use2dot
+++ b/scripts/use2dot
@@ -1,7 +1,7 @@
 #!/bin/sh
 # aside from this initial boilerplate, this is actually -*- scheme -*- code
 main='(module-ref (resolve-module '\''(scripts use2dot)) '\'main')'
-exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
+exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
 !#
 ;;; use2dot --- Display module dependencies as a DOT specification