diff --git a/Makefile b/Makefile
index 7166c4a..b76d445 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,25 @@
 prefix ?= usr/local
 DESTDIR := 
 ICONSIZES := 64 128
+BIT := $(shell getconf LONG_BIT)
 define \n
 
 
 endef
 
-build/cowsrevenge: $(wildcard "Scenes/*/*") $(wildcard "Locales/*") $(wildcard "Sound/*") $(wildcard "Music/*") $(wildcard "Sprites/*") $(wildcard "Sprites/*/*") $(wildcard "Fonts/*") $(wildcard "Fonts/*/*") export.cfg engine.cfg d.tscn build/godot/bin/godot_server.server.opt.tools.64
-	cd build/godot; scons platform=x11 tools=no target=release bits=`getconf LONG_BIT` use_llvm=yes -j `nproc`
-	mkdir -p build/templates/
-	cp build/godot/bin/godot.x11*.llvm build/templates/linux_x11_`getconf LONG_BIT`_release
-	build/godot/bin/godot_server.server.opt.tools.64 -export "Linux X11" build/cowsrevenge
+build/cowsrevenge: $(wildcard "Scenes/*/*") $(wildcard "Locales/*") $(wildcard "Sound/*") $(wildcard "Music/*") $(wildcard "Sprites/*") $(wildcard "Sprites/*/*") $(wildcard "Fonts/*") $(wildcard "Fonts/*/*") export.cfg engine.cfg d.tscn build/godot/bin/godot_server.server.opt.tools.$(BIT)
+	# put into self contained mode
+	touch build/godot/bin/._sc_
+	cd build/godot; scons -j `nproc` platform=x11 target=release bits=$(BIT) use_llvm=yes tools=no 
+	mkdir -p build/godot/bin/editor_data/templates/
+	cp build/godot/bin/godot.x11*.llvm build/godot/bin/editor_data/templates/linux_x11_$(BIT)_release
+	build/godot/bin/godot_server.server.opt.tools.$(BIT) -export "Linux X11" build/cowsrevenge
 
 #build engine
-build/godot/bin/godot_server.server.opt.tools.64:
+build/godot/bin/godot_server.server.opt.tools.$(BIT):
 	mkdir -p build
 	cd build; git clone -b 2.1 --single-branch https://github.com/godotengine/godot || true
-	cd build/godot; scons -j `nproc` platform=server target=release_debug use_llvm=yes unix_global_settings_path=".."
+	cd build/godot; scons -j `nproc` platform=server target=release_debug bits=$(BIT) use_llvm=yes unix_global_settings_path=".."
 
 .PHONY: install
 install: build/cowsrevenge $(wildcard "linux_build/*")