diff --git a/bin/bootstrap b/bin/bootstrap
index 0c08aa0..3670ecf 100755
--- a/bin/bootstrap
+++ b/bin/bootstrap
@@ -24,7 +24,7 @@ default_fermi_spack_tools_repo=https://github.com/FNALssi/fermi-spack-tools.git
 
 parse_args() {
     with_padding=""
-    if x=$(getopt --longoptions with_padding,help,query-packages,fermi_spack_tools_release:,spack_release:,spack_repo:,fermi_spack_tools_repo: -- x "$@")
+    if x=$(getopt --options "" --longoptions with_padding,help,query-packages,fermi_spack_tools_release:,spack_release:,spack_repo:,fermi_spack_tools_repo: -- "$@")
     then
         eval set : $x
         shift
diff --git a/bin/make_packages_yaml b/bin/make_packages_yaml
index cbdccb0..b9725a7 100755
--- a/bin/make_packages_yaml
+++ b/bin/make_packages_yaml
@@ -18,11 +18,10 @@ usage() {
 
 src=$dir/templates/packagelist
 want_cvmfs=false
-if x=$(getopt --longoptions --long-options help,with-externals,with-cvmfs,debug,packagelist:  -- "$@")
+if x=$(getopt --options "" --longoptions "help,with-externals,with-cvmfs,debug,packagelist:"  -- "$@")
 then
     eval set : $x
     shift
-    shift
 else
     usage
     exit 1
@@ -53,6 +52,7 @@ x--packagelist=*)
     src=`echo $1 | sed -e 's/--packagelist=//'`
     shift
     ;;
+x--)                    shift; break;;
 x*)
     break;;
 esac
diff --git a/bin/make_spack b/bin/make_spack
index 5d8ec87..0356cb0 100755
--- a/bin/make_spack
+++ b/bin/make_spack
@@ -246,7 +246,7 @@ parse_args() {
     verbose=false
 
     origargs="$*"
-    if x=$(getopt --longoptions help,depth,with_padding,upgrade,spack_release:,minimal,no_buildcache,spack_repo:,query-packages --options mptuv -- : "$@")
+    if x=$(getopt --longoptions help,depth,with_padding,upgrade,spack_release:,minimal,no_buildcache,repover,spack_repo:,query-packages --options mptuv -- "$@")
     then
         eval set : $x
         shift