diff --git a/Makefile b/Makefile
index d0821375..2977bd8b 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ CONF := $(DESTDIR)/$(CONFIG_PATH)
 SHARE := $(DESTDIR)/usr/share/spreed-webrtc-server
 
 BUILD_ARCH := $(shell go env GOARCH)
+BUILD_OS := $(shell go env GOOS)
 DIST := $(CURDIR)/dist_$(BUILD_ARCH)
 DIST_SRC := $(DIST)/src
 DIST_BIN := $(DIST)/bin
@@ -185,6 +186,6 @@ tarball: DOCS = $(CONF)/docs
 tarball: SHARE = $(TARPATH)/
 tarball: distclean release install
 		echo -n $(VERSION) > $(TARPATH)/version.txt
-		tar czf $(DIST)/$(PACKAGE_NAME).tar.gz -C $(DIST) $(PACKAGE_NAME)
+		tar czf $(DIST)/$(PACKAGE_NAME)_$(BUILD_OS)_$(BUILD_ARCH).tar.gz -C $(DIST) $(PACKAGE_NAME)
 
 .PHONY: hook clean distclean pristine get getupdate build styles javascript release releasetest dist_gopath install gopath binary binaryrace binaryall tarball assets
diff --git a/doc/CROSSCOMPILE.txt b/doc/CROSSCOMPILE.txt
new file mode 100644
index 00000000..791380d4
--- /dev/null
+++ b/doc/CROSSCOMPILE.txt
@@ -0,0 +1,32 @@
+Linux:
+
+  Target linux/amd64
+    GOOS=linux GOARCH=amd64 make tarball
+
+  Target linux/386:
+    GOOS=linux GOARCH=386 make tarball
+
+  Target linux/armv5
+    GOOS=linux GOARCH=arm GOARM=5 make tarball
+
+  Target linux/armv6
+    GOOS=linux GOARCH=arm GOARM=6 make tarball
+
+  Target linux/armv7
+    GOOS=linux GOARCH=arm GOARM=7 make tarball
+
+
+Mac:
+
+  Target darwin/amd64
+    GOOS=darwin GOARCH=amd64 make tarball
+
+
+Windows:
+
+  Target windows/386
+    GOOS=windows GOARCH=386 make tarball
+
+  Target windows/amd64
+    GOOS=windows GOARCH=amd64 make tarball
+