diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index 691b3925..db7a02c0 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -41,6 +41,7 @@ The full set of tests is only run for tagged releases.
     - librtools/RparseUrl: add DirName,FileName,FileStem,FileType
   - derive ReventFd and RtimerFd from Rfd
   - generic_so.mk: use -scrUuv for ar to avoid "'u' modifier ignored"
+  - tools/oskit/hook/hook_ibmon_*.tcl: check ibmon availability
 - firmware changes
   - sys_w11a_arty: down-rate to 72 MHz, viv 2019.1 fails with 75 MHz
   - sys_w11a_*.vmfset: add new rule for vivado 2019.1
diff --git a/tools/oskit/hook/hook_disk_over.tcl b/tools/oskit/hook/hook_disk_over.tcl
index 005537f0..87f81464 100644
--- a/tools/oskit/hook/hook_disk_over.tcl
+++ b/tools/oskit/hook/hook_disk_over.tcl
@@ -1,3 +1,6 @@
-# $Id: hook_disk_over.tcl 899 2017-05-27 13:25:41Z mueller $
+# $Id: hook_disk_over.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2017-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
 puts "hook: set default diskscheme to over"
 rlw set diskscheme over
diff --git a/tools/oskit/hook/hook_dmscnt.tcl b/tools/oskit/hook/hook_dmscnt.tcl
index ec6375e9..e44fcfc1 100644
--- a/tools/oskit/hook/hook_dmscnt.tcl
+++ b/tools/oskit/hook/hook_dmscnt.tcl
@@ -1,3 +1,10 @@
-# $Id: hook_dmscnt.tcl 899 2017-05-27 13:25:41Z mueller $
-puts "hook: start dmscnt"
-rw11::sc_start
+# $Id: hook_dmscnt.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2017-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
+if {[cpu0 imap -testname sc.cntl]} {
+  puts "hook: start dmscnt"
+  rw11::sc_start
+} else {
+  puts "hook: dmscnt not available, hook_dmscnt ignored"
+}
diff --git a/tools/oskit/hook/hook_ibmon_dza.tcl b/tools/oskit/hook/hook_ibmon_dza.tcl
index d47dbcc7..3fae9350 100644
--- a/tools/oskit/hook/hook_ibmon_dza.tcl
+++ b/tools/oskit/hook/hook_ibmon_dza.tcl
@@ -1,7 +1,14 @@
-# $Id: hook_ibmon_dza.tcl 1149 2019-05-12 21:00:29Z mueller $
-puts "hook: start ibmon for dza"
-package require ibd_ibmon
-ibd_ibmon::stop
-cpu0 cp -wibr im.lolim [cpu0 imap dza.csr] \
-        -wibr im.hilim [cpu0 imap dza.tdr]
-ibd_ibmon::start
+# $Id: hook_ibmon_dza.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2019- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
+if {[cpu0 imap -testname im.lolim]} {
+  puts "hook: start ibmon for dza"
+  package require ibd_ibmon
+  ibd_ibmon::stop
+  cpu0 cp -wibr im.lolim [cpu0 imap dza.csr] \
+          -wibr im.hilim [cpu0 imap dza.tdr]
+  ibd_ibmon::start
+} else {
+  puts "hook: ibmon not available, hook_ibmon_dza ignored"
+}
diff --git a/tools/oskit/hook/hook_ibmon_lpa.tcl b/tools/oskit/hook/hook_ibmon_lpa.tcl
index a465d064..451f8d5a 100644
--- a/tools/oskit/hook/hook_ibmon_lpa.tcl
+++ b/tools/oskit/hook/hook_ibmon_lpa.tcl
@@ -1,7 +1,14 @@
-# $Id: hook_ibmon_lpa.tcl 1122 2019-03-17 08:15:42Z mueller $
-puts "hook: start ibmon for lpa"
-package require ibd_ibmon
-ibd_ibmon::stop
-cpu0 cp -wibr im.lolim [cpu0 imap lpa.csr] \
-        -wibr im.hilim [cpu0 imap lpa.buf]
-ibd_ibmon::start
+# $Id: hook_ibmon_lpa.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2019- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
+if {[cpu0 imap -testname im.lolim]} {
+  puts "hook: start ibmon for lpa"
+  package require ibd_ibmon
+  ibd_ibmon::stop
+  cpu0 cp -wibr im.lolim [cpu0 imap lpa.csr] \
+          -wibr im.hilim [cpu0 imap lpa.buf]
+  ibd_ibmon::start
+} else {
+  puts "hook: ibmon not available, hook_ibmon_lpa ignored"
+}
diff --git a/tools/oskit/hook/hook_ibmon_pca.tcl b/tools/oskit/hook/hook_ibmon_pca.tcl
index bc0dc966..56099bf2 100644
--- a/tools/oskit/hook/hook_ibmon_pca.tcl
+++ b/tools/oskit/hook/hook_ibmon_pca.tcl
@@ -1,7 +1,14 @@
-# $Id: hook_ibmon_pca.tcl 1126 2019-04-06 17:37:40Z mueller $
-puts "hook: start ibmon for pca"
-package require ibd_ibmon
-ibd_ibmon::stop
-cpu0 cp -wibr im.lolim [cpu0 imap pca.rcsr] \
-        -wibr im.hilim [cpu0 imap pca.pbuf]
-ibd_ibmon::start
+# $Id: hook_ibmon_pca.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2019- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
+if {[cpu0 imap -testname im.lolim]} {
+  puts "hook: start ibmon for pca"
+  package require ibd_ibmon
+  ibd_ibmon::stop
+  cpu0 cp -wibr im.lolim [cpu0 imap pca.rcsr] \
+          -wibr im.hilim [cpu0 imap pca.pbuf]
+  ibd_ibmon::start
+} else {
+  puts "hook: ibmon not available, hook_ibmon_pca ignored"
+}
diff --git a/tools/oskit/hook/hook_ibmon_rka.tcl b/tools/oskit/hook/hook_ibmon_rka.tcl
index 1b4f4aa8..18b41807 100644
--- a/tools/oskit/hook/hook_ibmon_rka.tcl
+++ b/tools/oskit/hook/hook_ibmon_rka.tcl
@@ -1,7 +1,14 @@
-# $Id: hook_ibmon_rka.tcl 899 2017-05-27 13:25:41Z mueller $
-puts "hook: start ibmon for rka"
-package require ibd_ibmon
-ibd_ibmon::stop
-cpu0 cp -wibr im.lolim [cpu0 imap rka.ds] \
-        -wibr im.hilim [cpu0 imap rka.mr]
-ibd_ibmon::start
+# $Id: hook_ibmon_rka.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2015-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
+if {[cpu0 imap -testname im.lolim]} {
+  puts "hook: start ibmon for rka"
+  package require ibd_ibmon
+  ibd_ibmon::stop
+  cpu0 cp -wibr im.lolim [cpu0 imap rka.ds] \
+          -wibr im.hilim [cpu0 imap rka.mr]
+  ibd_ibmon::start
+} else {
+  puts "hook: ibmon not available, hook_ibmon_rka ignored"
+}
diff --git a/tools/oskit/hook/hook_ibmon_rpa.tcl b/tools/oskit/hook/hook_ibmon_rpa.tcl
index e086ae2c..25a7e52e 100644
--- a/tools/oskit/hook/hook_ibmon_rpa.tcl
+++ b/tools/oskit/hook/hook_ibmon_rpa.tcl
@@ -1,7 +1,14 @@
-# $Id: hook_ibmon_rpa.tcl 899 2017-05-27 13:25:41Z mueller $
-puts "hook: start ibmon for rpa"
-package require ibd_ibmon
-ibd_ibmon::stop
-cpu0 cp -wibr im.lolim [cpu0 imap rpa.cs1] \
-        -wibr im.hilim [cpu0 imap rpa.cs3]
-ibd_ibmon::start
+# $Id: hook_ibmon_rpa.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2015-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
+if {[cpu0 imap -testname im.lolim]} {
+  puts "hook: start ibmon for rpa"
+  package require ibd_ibmon
+  ibd_ibmon::stop
+  cpu0 cp -wibr im.lolim [cpu0 imap rpa.cs1] \
+          -wibr im.hilim [cpu0 imap rpa.cs3]
+  ibd_ibmon::start
+} else {
+  puts "hook: ibmon not available, hook_ibmon_rpa ignored"
+}
diff --git a/tools/oskit/hook/hook_ibmon_tma.tcl b/tools/oskit/hook/hook_ibmon_tma.tcl
index 8f2eedee..88c8807d 100644
--- a/tools/oskit/hook/hook_ibmon_tma.tcl
+++ b/tools/oskit/hook/hook_ibmon_tma.tcl
@@ -1,7 +1,14 @@
-# $Id: hook_ibmon_tma.tcl 899 2017-05-27 13:25:41Z mueller $
-puts "hook: start ibmon for tma"
-package require ibd_ibmon
-ibd_ibmon::stop
-cpu0 cp -wibr im.lolim [cpu0 imap tma.sr] \
-        -wibr im.hilim [cpu0 imap tma.rl]
-ibd_ibmon::start
+# $Id: hook_ibmon_tma.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2015-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
+if {[cpu0 imap -testname im.lolim]} {
+  puts "hook: start ibmon for tma"
+  package require ibd_ibmon
+  ibd_ibmon::stop
+  cpu0 cp -wibr im.lolim [cpu0 imap tma.sr] \
+          -wibr im.hilim [cpu0 imap tma.rl]
+  ibd_ibmon::start
+} else {
+  puts "hook: ibmon not available, hook_ibmon_tma ignored"
+}
diff --git a/tools/oskit/hook/hook_ibmon_tta.tcl b/tools/oskit/hook/hook_ibmon_tta.tcl
index a76a240e..b3d2972c 100644
--- a/tools/oskit/hook/hook_ibmon_tta.tcl
+++ b/tools/oskit/hook/hook_ibmon_tta.tcl
@@ -1,7 +1,14 @@
-# $Id: hook_ibmon_tta.tcl 1126 2019-04-06 17:37:40Z mueller $
-puts "hook: start ibmon for tta"
-package require ibd_ibmon
-ibd_ibmon::stop
-cpu0 cp -wibr im.lolim [cpu0 imap tta.rcsr] \
-        -wibr im.hilim [cpu0 imap tta.xbuf]
-ibd_ibmon::start
+# $Id: hook_ibmon_tta.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2019- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
+if {[cpu0 imap -testname im.lolim]} {
+  puts "hook: start ibmon for tta"
+  package require ibd_ibmon
+  ibd_ibmon::stop
+  cpu0 cp -wibr im.lolim [cpu0 imap tta.rcsr] \
+          -wibr im.hilim [cpu0 imap tta.xbuf]
+  ibd_ibmon::start
+} else {
+  puts "hook: ibmon not available, hook_ibmon_tta ignored"
+}
diff --git a/tools/oskit/hook/hook_ibmon_xua.tcl b/tools/oskit/hook/hook_ibmon_xua.tcl
index 6be666ad..634770c6 100644
--- a/tools/oskit/hook/hook_ibmon_xua.tcl
+++ b/tools/oskit/hook/hook_ibmon_xua.tcl
@@ -1,9 +1,14 @@
-# $Id: hook_ibmon_xua.tcl 901 2017-05-28 11:26:11Z mueller $
-puts "hook: start ibmon for xua"
-
-# set filter on xua registers
-# repeat collapse for reads (211bsd driver does polling!)
-
-.imd
-.imf xua.pr0 xua.pr3
-.ime R
+# $Id: hook_ibmon_xua.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2017-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
+if {[cpu0 imap -testname im.lolim]} {
+  puts "hook: start ibmon for xua"
+  # set filter on xua registers
+  # repeat collapse for reads (211bsd driver does polling!)
+  .imd
+  .imf xua.pr0 xua.pr3
+  .ime R
+} else {
+  puts "hook: ibmon not available, hook_ibmon_xua ignored"
+}
diff --git a/tools/oskit/hook/hook_trace_blkdev.tcl b/tools/oskit/hook/hook_trace_blkdev.tcl
index 4bfa4d9b..4c7d6884 100644
--- a/tools/oskit/hook/hook_trace_blkdev.tcl
+++ b/tools/oskit/hook/hook_trace_blkdev.tcl
@@ -1,4 +1,7 @@
-# $Id: hook_blkdev_trace.tcl 899 2017-05-27 13:25:41Z mueller $
+# $Id: hook_trace_blkdev.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2017-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
 puts "hook: trace all block devices to rlc.log"
 rlc set logfile rlc.log
 cpu0rka set trace 2
diff --git a/tools/oskit/hook/hook_trace_dza.tcl b/tools/oskit/hook/hook_trace_dza.tcl
index 9e3b0352..ab83498a 100644
--- a/tools/oskit/hook/hook_trace_dza.tcl
+++ b/tools/oskit/hook/hook_trace_dza.tcl
@@ -1,4 +1,7 @@
-# $Id: hook_dz11_trace.tcl 1149 2019-05-12 21:00:29Z mueller $
+# $Id: hook_trace_dza.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2019- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
 puts "hook: trace DZ11 to rlc.log"
 rlc set logfile rlc.log
 cpu0dza set trace 5
diff --git a/tools/oskit/hook/hook_trace_lpa.tcl b/tools/oskit/hook/hook_trace_lpa.tcl
index 02837051..444efc3a 100644
--- a/tools/oskit/hook/hook_trace_lpa.tcl
+++ b/tools/oskit/hook/hook_trace_lpa.tcl
@@ -1,4 +1,7 @@
-# $Id: hook_lp11_trace.tcl 1121 2019-03-11 08:59:12Z mueller $
+# $Id: hook_trace_lpa.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2019- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
 puts "hook: trace LP11 to rlc.log"
 rlc set logfile rlc.log
 cpu0lpa set trace 2
diff --git a/tools/oskit/hook/hook_trace_xua.tcl b/tools/oskit/hook/hook_trace_xua.tcl
index 6a7e9336..4aa2c1a7 100644
--- a/tools/oskit/hook/hook_trace_xua.tcl
+++ b/tools/oskit/hook/hook_trace_xua.tcl
@@ -1,4 +1,7 @@
-# $Id: hook_deuna_trace.tcl 899 2017-05-27 13:25:41Z mueller $
+# $Id: hook_trace_xua.tcl 1169 2019-06-21 07:00:59Z mueller $
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright 2017-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+#
 puts "hook: trace DEUNA to rlc.log"
 rlc set logfile rlc.log
 cpu0xua set trace 2