diff --git a/releng/TODO b/releng/TODO
index 391e29c9..4c589bc2 100644
--- a/releng/TODO
+++ b/releng/TODO
@@ -11,18 +11,11 @@
   MD5s should be checked. ACLs and xattr (if we are on Linux).
   All file types as of stat(2) should be tested.
 
-* Also check (in releng_isocontent) simple operations like:
-  xorrisofs foo/ > foo.iso
-  xorrisofs foo/ -o foo.iso
-  xorrisofs foo/ | cat > foo.iso
+* Also check trivial operations like --devices, etc.
   
-  result in producing an ISO image. Verify the result with:
-  'file' 
-  xorriso -pvd_info
-  others
-  
-  Such trivial operations could be separated in another releng_ test
-  which should also check other trivial operations like --devices, etc.
+* Split off common functionality in common ./lib/ so it can be re-used
+  by all scripts. This might include cmdline option parsing, some
+  validation code like releng_isocontent:is_valid_iso9660
 
 * We need to give a hint about how much storage space will be consumed.
 
diff --git a/releng/releng_isocontent b/releng/releng_isocontent
index f440de9f..d6f280f7 100755
--- a/releng/releng_isocontent
+++ b/releng/releng_isocontent
@@ -170,13 +170,13 @@ is_valid_iso9660() {
  ISOfile="$1"
  if [ ! -f ${ISOfile} ]; then
    failure=1
-   printf "=== FAIL Not found: ${ISOfile}\n"
+   printf "${prog}: FAIL: Not found: ${ISOfile}\n"
  fi
  if file ${ISOfile} | grep -P "ISO\s+9660\s+CD-ROM\s+filesystem\s+data" >/dev/null 2>&1; then
    printf "=== ${ISOfile} OK\n"
  else
    failure=1
-   printf "=== FAIL: ${ISOfile} does not look like ISO 9660 filesystem data\n"   
+   printf "${prog}: FAIL: ${ISOfile} does not look like ISO 9660 filesystem data\n"   
  fi
 }