diff --git a/debian/scripts/koha-remove b/debian/scripts/koha-remove
index 09720eae72..567ead819e 100755
--- a/debian/scripts/koha-remove
+++ b/debian/scripts/koha-remove
@@ -20,17 +20,17 @@
 set -e
 
 args=$(getopt -l keep-mysql -o k -n $0 -- "$@")
-set -- $args
+eval set -- $args
 while [ ! -z "$1" ]
 do
     case "$1" in
-         -k|--keep-mysql) keepmysql=1; exit;;
+         -k|--keep-mysql) keepmysql=1; shift;;
+         --) shift; break;;
           *) break;;
     esac
     shift
 done
 
-
 for name in "$@"
 do
     echo "Removing Koha instance $name"