diff --git a/libisoburn/trunk/releng/template_new b/libisoburn/trunk/releng/template_new
index 65370ade..50e9d470 100755
--- a/libisoburn/trunk/releng/template_new
+++ b/libisoburn/trunk/releng/template_new
@@ -27,8 +27,20 @@
 
 set -e
 
+
+# === TEMPLATE: Describe your own specific options (if any) and the test
+print_specific_help() {
+cat << HLP
+Specific options:
+       --option  Explanation of specific option
+Overview:
+       Short explanation of test purpose and activities.
+HLP
+} 
+
+
 getopts_inc=inc/releng_getopts.inc
-test -e ./inc/releng_getopts.inc
+if test -e "$getopts_inc"
 then
   . "$getopts_inc"
   
@@ -46,10 +58,6 @@ else
   exit 29  
 fi
 
-# Include common bits and interpret standard options
-# as listed by function print_help
-. inc/releng_getopts.inc
-
 
 # === TEMPLATE: Decide whether the test will have own options,
 # === TEMPLATE: apart from those interpreted by inc/releng_getopts.inc
@@ -121,5 +129,7 @@ fi
 # === TEMPLATE: 30 = Unexpected state of own directory for self generated files
 # === TEMPLATE: 29 = Not in ./releng directory or missing essential parts
 # === TEMPLATE: 1 to 28 = test specific exit values
+# === TEMPLATE: When exiting prematurely, make sure to call cleanup.
 
+cleanup
 exit 0