diff --git a/.gitignore b/.gitignore
index f768f7909ca84a190cd6d52a1522bf55d0a7e55d..f51a1f146124f24caadde19b8f4dfbc80eb4c105 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ core*
 software
 oldsrc
 CVS
+*-srv
diff --git a/Makefile b/Makefile
index 3553953adb14916136a91262562a82ad757f259f..4d36052b5b87710cc20761f9d811fa93daac0f21 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
+NAME_SRV=gof-gateway
 PY_FILES += $(wildcard src/*.py)
 
-default: bin ${PY_FILES}
-	@cp src/${NAME_SRV} ${PY_FILES} bin/
+default: bin/${NAME_SRV} ${PY_FILES}
+	@cp ${PY_FILES} bin/${NAME_SRV}
 
-bin:
-	@test -d $@ || mkdir $@
+bin/${NAME_SRV}:
+	@test -d $@ || mkdirhier $@
 
 clean:
 	@rm -fr bin/ src/*~