diff --git a/release/generate-release.sh b/release/generate-release.sh
index 31d1bf573c23..3514feccfb7b 100755
--- a/release/generate-release.sh
+++ b/release/generate-release.sh
@@ -27,23 +27,18 @@ usage()
 	exit 1
 }
 
-args=`getopt r: $*`
-if [ $? -ne 0 ]; then
-	usage
-fi
-set -- $args
 REVISION=
-while true; do
-	case "$1" in
-	-r)
-		REVISION="-r $2"
-		shift; shift
+while getopts r: opt; do
+	case $opt in
+	r)
+		REVISION="-r $OPTARG"
 		;;
-	--)
-		shift; break
+	\?)
+		usage
 		;;
 	esac
 done
+shift $(($OPTIND - 1))
 
 if [ $# -lt 2 ]; then
 	usage