diff --git a/appveyor.yml b/appveyor.yml
index 0f1c45b3..c1acdfaa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,9 +4,9 @@ install:
 
 build_script:
   - bash -c 'GOARCH=386 script/bootstrap'
-  - mv bin\git-lfs git-lfs-x86.exe
+  - mv bin\git-lfs.exe git-lfs-x86.exe
   - bash -c 'GOARCH=amd64 script/bootstrap'
-  - mv bin\git-lfs git-lfs-x64.exe
+  - mv bin\git-lfs.exe git-lfs-x64.exe
 
 after_build:
   - iscc script\windows-installer\inno-setup-git-lfs-installer.iss
diff --git a/script/build.go b/script/build.go
index f9610e85..d13e7550 100644
--- a/script/build.go
+++ b/script/build.go
@@ -16,7 +16,7 @@ import (
 )
 
 var (
-	BuildOS    = flag.String("os", "", "OS to target: darwin, freebsd, linux, windows")
+	BuildOS    = flag.String("os", runtime.GOOS, "OS to target: darwin, freebsd, linux, windows")
 	BuildArch  = flag.String("arch", "", "Arch to target: 386, amd64")
 	BuildAll   = flag.Bool("all", false, "Builds all architectures")
 	ShowHelp   = flag.Bool("help", false, "Shows help")