diff --git a/Makefile b/Makefile
index 4d36052b5b87710cc20761f9d811fa93daac0f21..d1c9c8eb74da9e57cda7b502e8251b416dc25559 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,16 @@
-NAME_SRV=gof-gateway
+NAME = gof-gateway-srv
+MAIN = GofGateway.py
+
+DIRNAME = $(NAME:-srv=)
 PY_FILES += $(wildcard src/*.py)
 
-default: bin/${NAME_SRV} ${PY_FILES}
-	@cp ${PY_FILES} bin/${NAME_SRV}
+default: bin ${PY_FILES}
+	@cp ${PY_FILES} bin/${DIRNAME}
+	@echo "#!/bin/bash\nexec ${DIRNAME}/${MAIN}" > bin/${NAME}
+	@chmod +x bin/${NAME} bin/${DIRNAME}/${MAIN}
 
-bin/${NAME_SRV}:
-	@test -d $@ || mkdirhier $@
+bin:
+	@test -d $@ || mkdir -p $@/${DIRNAME}
 
 clean:
 	@rm -fr bin/ src/*~