diff --git a/Makefile b/Makefile
index 2b1a4fae..6ed9e384 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,10 @@ client-server-with-tray:
 	cd cmd/client-server; \
 	$(GO) build -tags "with_tray " -o client-server-with-tray
 
+client-server-with-tray-windows:
+	cd cmd/client-server; \
+	$(GO) build -ldflags -H=windowsgui -tags "with_tray " -o client-server-with-tray
+
 client-server-with-notray:
 	cd cmd/client-server; \
     $(GO) build -tags "with_notray " -o client-server-with-notray
diff --git a/cmd/client-server/main.go b/cmd/client-server/main.go
index f08539d0..c34da45d 100644
--- a/cmd/client-server/main.go
+++ b/cmd/client-server/main.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"os"
 	"path"
+	"runtime"
 
 	"github.com/nange/easyss"
 	"github.com/nange/easyss/util"
@@ -36,7 +37,9 @@ func main() {
 	}
 	// we starting easyss as daemon only in client model, and save logs to file
 	var writer io.Writer
-	easyss.Daemon(godaemon)
+	if runtime.GOOS != "windows" {
+		easyss.Daemon(godaemon)
+	}
 	var err error
 	writer, err = util.GetLogFileWriter(easyss.LogMaxAge, easyss.LogRotationTime)
 	if err != nil {