diff --git a/.gitignore b/.gitignore
index 60a19df..00c7f28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .idea/
 Unnamed
 sofaraum-client
+sofa
 dist/
 cover.*
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 84b13e9..de02bb3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@ IMPORT := git.kolaente.de/sofaraum/client
 SED_INPLACE := sed -i
 
 ifeq ($(OS), Windows_NT)
-	EXECUTABLE := sofaraum-client.exe
+	EXECUTABLE := sofa.exe
 else
-	EXECUTABLE := sofaraum-client
+	EXECUTABLE := sofa
 	UNAME_S := $(shell uname -s)
 	ifeq ($(UNAME_S),Darwin)
 		SED_INPLACE := sed -i ''
@@ -29,9 +29,9 @@ TAGS ?=
 TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'sofaclient-temp')
 
 ifeq ($(OS), Windows_NT)
-	EXECUTABLE := sofaraum-client.exe
+	EXECUTABLE := sofa.exe
 else
-	EXECUTABLE := sofaraum-client
+	EXECUTABLE := sofa
 endif
 
 ifneq ($(DRONE_TAG),)
@@ -105,7 +105,7 @@ release-windows:
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		go install $(GOFLAGS) github.com/karalabe/xgo; \
 	fi
-	xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-w -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out sofaraum-client-$(VERSION) .
+	xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-w -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out sofa-$(VERSION) .
 ifeq ($(CI),drone)
 	mv /build/* $(DIST)/binaries
 endif
@@ -115,7 +115,7 @@ release-linux:
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		go install $(GOFLAGS) github.com/karalabe/xgo; \
 	fi
-	xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-w -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out sofaraum-client-$(VERSION) .
+	xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-w -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out sofa-$(VERSION) .
 ifeq ($(CI),drone)
 	mv /build/* $(DIST)/binaries
 endif
@@ -125,7 +125,7 @@ release-darwin:
 	@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		go install $(GOFLAGS) github.com/karalabe/xgo; \
 	fi
-	xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out sofaraum-client-$(VERSION) .
+	xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out sofa-$(VERSION) .
 ifeq ($(CI),drone)
 	mv /build/* $(DIST)/binaries
 endif