diff --git a/README.md b/README.md
index 9df12cc..2771f34 100644
--- a/README.md
+++ b/README.md
@@ -68,8 +68,8 @@ See the `conf.lua` file included to see how configuration works.
      Remember that x86 is always backwards compatible with x64.
      Depending on the Love version used, the script will choose which one,
      between x64 and x86 or x86 only to create.  
-`--W32`  Create Windows x86 executable only  
-`--W64`  Create Windows x64 executable only
+`-W32`  Create Windows x86 executable only  
+`-W64`  Create Windows x64 executable only
 
 #### PROJECT OPTIONS
 You can use the option of a module and append a long option from this list to set a specific
diff --git a/love-release.1 b/love-release.1
index 706d233..723d686 100644
--- a/love-release.1
+++ b/love-release.1
@@ -46,7 +46,7 @@ If you are targeting one of these, your project must be developed with Love 0.8.
 Depending on the Love version used, the script will choose which one,
 between x64 only or Universal Build to create.
 .TP
-.BR \-W
+.BR \-W \fIarch\fR
 Create Windows application.
 Starting with Love 0.8.0, a release is specially available for Windows x64.
 If you are targeting one of these, your project must be developed with Love 0.8.0 or newer.
@@ -54,10 +54,10 @@ Remember that x86 is always backwards compatible with x64.
 Depending on the Love version used, the script will choose which one,
 between x64 and x86 or x86 only to create.
 .br
-.B \-\-W32
+.B \-W32
 Create Windows x86 executable only.
 .br
-.B \-\-W64
+.B \-W64
 Create Windows x64 executable only.
 .SH PROJECT OPTIONS
 You can use the option of a module and append a long option from this list to set a specific
diff --git a/scripts/windows.sh b/scripts/windows.sh
index c100878..3827017 100644
--- a/scripts/windows.sh
+++ b/scripts/windows.sh
@@ -1,7 +1,7 @@
 # Windows
 init_module "Windows" "windows" "W"
-OPTIONS="W"
-LONG_OPTIONS="appid:,installer,32,64"
+OPTIONS="W::"
+LONG_OPTIONS="appid:,installer"
 
 if [[ -z $IDENTITY ]]; then
     IDENTITY=$(echo $IDENTITY | sed -e 's/[^-a-zA-Z0-9_]/-/g' | tr '[:upper:]' '[:lower:]')
@@ -11,8 +11,10 @@ while true; do
     case "$1" in
         --Wappid )     APPID="$2"; shift 2 ;;
         --Winstaller ) INSTALLER=true; shift ;;
-        --W32 )        X32=true; shift ;;
-        --W64 )        X64=true; shift ;;
+        -W )           if [[ -z "$2" ]]; then X32=true; X64=true;
+                       elif (( "$2" == 32 )); then X32=true;
+                       elif (( "$2" == 64 )); then X64=true;
+                       fi; shift ;;
         -- ) break ;;
         * ) shift ;;
     esac
@@ -156,8 +158,9 @@ EOF
 
 fi
 
-
-if [[ ${X32:=false} == false && ${X64:=false} == false ]]; then
+${X32:=false}
+${X64:=false}
+if [[ $X32 == false && $X64 == false ]]; then
     X32=true
     X64=true
 fi