@@ -6,13 +6,15 @@
 # Help
 function print_help() {
 	echo 'download-api-client [--platform <platform>] [--tcl-version <version>]'
 	echo '                    [--kitcreator-version <version>] [--kitdll]'
 	echo '                    [--threaded] [--debug] [--dynamictk]'
-	echo '                    [--staticpkgs] [--verbose]'
+	echo '                    [--staticpkgs] [--verbose] [--pkg-<package>...]'
+	echo '                    [--opt-<option>...] [--empty-packages]'
 	echo 'download-api-client {--help|--platforms|--tcl-versions|'
-	echo '                     --kitcreator-versions|--packages}'
+	echo '                     --kitcreator-versions|--packages|'
+	echo '                     --options}'
 }
 
 # Set arguments
 declare -A jsonArgs
 jsonArgs["platform"]="$(uname -s)-$(uname -m)"
@@ -20,10 +22,11 @@
 nextArg=''
 kit_filename=''
 options=()
 packages=()
 internalOptionsVerbose='false'
+noPackages='false'
 for arg in "$@"; do
 	if [ -n "${nextArg}" ]; then
 		jsonArgs["${nextArg}"]="${arg}"
 		nextArg=''
 		continue
@@ -38,12 +41,20 @@
 			nextArg="${nextArg//-/_}"
 			;;
 		--kitdll|--threaded|--debug|--dynamictk|--staticpkgs)
 			options+=("${arg:2}")
 			;;
-		--mk4tcl|--tcc4tcl|--tclcurl|--tk|--tls|--tuapi|--itcl|--duktape|--lmdb|--udp)
-			packages+=("${arg:2}")
+		--opt-*)
+			options+=("${arg:6}")
+			;;
+		--pkg-*)
+			packages+=("${arg:6}")
+			noPackages='false'
+			;;
+		--empty-packages)
+			packages=()
+			noPackages='true'
 			;;
 		--platforms|--tcl-versions|--kitcreator-versions|--packages|--options)
 			action="${arg:2}"
 			action="${action//-/_}"
 
@@ -68,11 +79,11 @@
 
 if [ -n "${options[*]}" ]; then
 	jsonArgs["options"]="${options[*]}"
 fi
 
-if [ -n "${packages[*]}" ]; then
+if [ -n "${packages[*]}" -o "${noPackages}" = 'true' ]; then
 	jsonArgs["packages"]="${packages[*]}"
 fi
 
 # Convert arguments into a request
 jqArgs=()