diff --git a/util/abuild/abuild b/util/abuild/abuild
index 5509822e7d..c85db2c58d 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -676,10 +676,13 @@ while true ; do
 			configoptions="$(cat "$1")${configoptions}\n"
 			shift;;
 		--)		shift; break;;
-		-*)		printf "Invalid option\n\n"; myhelp; exit 1;;
+		-*)		printf "Invalid option '%s'\n\n" "$1"; myhelp; exit 1;;
 		*)		break;;
 	esac
 done
+if [ -n "$1" ]; then
+	printf "Invalid option '%s'\n\n" "$1"; myhelp; exit 1;
+fi
 
 if [ -z "$TARGET" ] || [ "$TARGET" = "/" ]; then
 	echo "Please specify a valid, non-root build directory."