diff --git a/releng/inc/releng_getopts.inc b/releng/inc/releng_getopts.inc
index 0263ca12..d404b448 100644
--- a/releng/inc/releng_getopts.inc
+++ b/releng/inc/releng_getopts.inc
@@ -4,9 +4,8 @@
 
 SELF=$(basename $0)
 RELENG_XORRISO=0
-KEEP=0
 SIMULATE_FAILURE=0
-CLEANUP=0
+CLEANUP=1
 RELENG_PRINTED_HELP=0
 
 START_DIR_DONT_CHANGE=`pwd`
@@ -37,8 +36,7 @@ unboldify() {
 
 #############################################
 cleanup() {
-# if [ ${KEEP} -eq 0 -a ${CLEANUP} -eq 1 ]; then
- if [ ${KEEP} -eq 0 ]; then
+ if [ ${CLEANUP} -eq 1 ]; then
    # safety net, just in case -> we want to be in the starting
    # directory before removing whatever self-generated stuff
    if [ -d "${GEN_DATA_DIR}" ]; then
@@ -135,7 +133,7 @@ do
        next_is="x"
   elif test x"$i" = x"-k"
   then
-       KEEP=1
+       CLEANUP=0
   elif test x"$i" = x"-c"
   then
        CLEANUP=1
@@ -167,5 +165,3 @@ then
        print_help
        exit 31
 fi
-
-
diff --git a/releng/inc/test_releng_getopt b/releng/inc/test_releng_getopt
index dee8d849..02fd2181 100755
--- a/releng/inc/test_releng_getopt
+++ b/releng/inc/test_releng_getopt
@@ -5,7 +5,6 @@ set -e
 . releng_getopts.inc
 
 printf "\nRELENG_XORRISO   =${RELENG_XORRISO}"
-printf "\nKEEP             =${KEEP}"
 printf "\nCLEANUP          =${CLEANUP}"
 printf "\nSIMULATE_FAILURE =${SIMULATE_FAILURE}"
 printf "\n"