diff --git a/doc/dev/benchmark-oprofile b/doc/dev/benchmark-oprofile
old mode 100644
new mode 100755
index c60ef909..4fb965f3
--- a/doc/dev/benchmark-oprofile
+++ b/doc/dev/benchmark-oprofile
@@ -1,12 +1,23 @@
-10:37 <dynamite> #!/bin/sh
-10:37 <dynamite> opcontrol --no-vmlinux > /dev/null
-10:37 <dynamite> opcontrol --stop > /dev/null
-10:37 <dynamite> opcontrol --shutdown > /dev/null
-10:37 <dynamite> opcontrol --reset > /dev/null
-10:37 <dynamite> opcontrol --separate=none > /dev/null
-10:37 <dynamite> opcontrol $* > /dev/null
-10:37 <dynamite> opcontrol --start > /dev/null
-10:37 <dynamite> ./urpcbench 0 0 1
-10:37 <dynamite> opcontrol --stop > /dev/null
-10:37 <dynamite> opcontrol --dump > /dev/null
-10:37 <dynamite> opreport -l urpcbench
+#!/bin/sh -x
+
+# Cleanup
+opcontrol --no-vmlinux
+opcontrol --stop
+opcontrol --shutdown
+opcontrol --reset
+
+# Record all calls
+opcontrol --separate=none
+
+# NMI conflicts with oprofile
+echo 0 > /proc/sys/kernel/nmi_watchdog
+
+# Select events to be recorded
+opcontrol --event=CPU_CLK_UNHALTED:30000:0:1:1
+
+opcontrol --start
+# The actual programm
+"$@"
+opcontrol --stop
+opcontrol --dump
+echo "Output: opreport -l"