diff --git a/bin/make_packages_yaml b/bin/make_packages_yaml
index b82bddd..249813b 100755
--- a/bin/make_packages_yaml
+++ b/bin/make_packages_yaml
@@ -18,7 +18,7 @@ usage() {
 
 src=$dir/templates/packagelist
 want_cvmfs=false
-if x=$(getopt --longoptions --long-options help,with-externals,with-cvmfs,debug,packagelist:  -- "$@")
+if x=$(getopt --longoptions "help,with-externals,with-cvmfs,debug,packagelist:" : "$@")
 then
     eval set : $x
     shift
@@ -52,6 +52,7 @@ x--packagelist=*)
     src=`echo $1 | sed -e 's/--packagelist=//'`
     shift
     ;;
+x--)                    shift; break;;
 x*)
     break;;
 esac