diff -ruN src-old/examples/futexes.stp src/examples/futexes.stp
--- src-old/examples/futexes.stp	2007-01-02 05:33:41.000000000 +0100
+++ src/examples/futexes.stp	2007-06-30 23:26:25.000000000 +0200
@@ -1,4 +1,4 @@
-#! stap
+#! /usr/bin/env stap
 
 # This script tries to identify contended user-space locks by hooking
 # into the futex system call.
diff -ruN src-old/examples/pf2.stp src/examples/pf2.stp
--- src-old/examples/pf2.stp	2007-01-02 05:33:41.000000000 +0100
+++ src/examples/pf2.stp	2007-06-30 23:26:41.000000000 +0200
@@ -1,4 +1,4 @@
-#! stap
+#! /usr/bin/env stap
 global profile, pcount
 probe timer.profile {
   pcount ++
diff -ruN src-old/examples/sig_by_pid.stp src/examples/sig_by_pid.stp
--- src-old/examples/sig_by_pid.stp	2007-05-31 07:18:14.000000000 +0200
+++ src/examples/sig_by_pid.stp	2007-06-30 23:26:56.000000000 +0200
@@ -1,4 +1,4 @@
-#! stap
+#! /usr/bin/env stap
 
 # Copyright (C) 2006 IBM Corp.
 #
diff -ruN src-old/examples/sig_by_proc.stp src/examples/sig_by_proc.stp
--- src-old/examples/sig_by_proc.stp	2007-05-31 07:24:10.000000000 +0200
+++ src/examples/sig_by_proc.stp	2007-06-30 23:27:07.000000000 +0200
@@ -1,4 +1,4 @@
-#! stap
+#! /usr/bin/env stap
 
 # Copyright (C) 2006 IBM Corp.
 #
diff -ruN src-old/examples/sigmon.stp src/examples/sigmon.stp
--- src-old/examples/sigmon.stp	2007-06-05 19:30:18.000000000 +0200
+++ src/examples/sigmon.stp	2007-06-30 23:27:21.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh stap
+#! /usr/bin/env stap
 
 # Copyright (C) 2006 IBM Corp.
 #
diff -ruN src-old/examples/syscalls_by_pid.stp src/examples/syscalls_by_pid.stp
--- src-old/examples/syscalls_by_pid.stp	2007-04-25 01:04:43.000000000 +0200
+++ src/examples/syscalls_by_pid.stp	2007-06-30 23:27:45.000000000 +0200
@@ -1,4 +1,4 @@
-#! stap
+#! /usr/bin/env stap
 
 # Copyright (C) 2006 IBM Corp.
 #
diff -ruN src-old/examples/syscalls_by_proc.stp src/examples/syscalls_by_proc.stp
--- src-old/examples/syscalls_by_proc.stp	2007-04-25 01:04:43.000000000 +0200
+++ src/examples/syscalls_by_proc.stp	2007-06-30 23:28:01.000000000 +0200
@@ -1,4 +1,4 @@
-#! stap
+#! /usr/bin/env stap
 
 # Copyright (C) 2006 IBM Corp.
 #