diff --git a/make/topdir.mk b/make/topdir.mk
index e0f131a8..e5d25d5f 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -11,7 +11,7 @@ SUBDIRS       ?= $(wildcard inst/pre make scripts contrib src libsrc \
 PROJECT_DESCR  = $(TOPDIR)/make/project.conf
 GIT_DESCR      = $(TOPDIR)/.git/description
 WHOAMI         = $(shell whoami)
-REMOTE_GIT_DIR = /srv/git/$(WHOAMI)/proj/$(PROJECT)
+REMOTE_GIT_DIR = /srv/git/$(WHOAMI)/proj/$(RPM_PROJECT)
 REMOTE_GIT_URL = ssh://$(WHOAMI)@git.jannet.de$(REMOTE_GIT_DIR)
 
 
@@ -97,27 +97,27 @@ git-init-from-cvs: git-init
 	git commit -m "initial checkin of $(RPM_VERSION)"
 
 git-config:
-	git config --global user.name $(FULL_NAME)
+	git config --global user.name "$(FULL_NAME)"
 	git config --global user.email $(WHOAMI)@janware.com
 	git remote add origin $(REMOTE_GIT_URL)
 	git remote set-url --push origin $(REMOTE_GIT_URL)
 
 git-clone-to-remote:
-	ssh git.jannet.de "/opt/ytools/bin/git-srv-admin.sh -j create-personal-project $(PROJECT)"
+	ssh git.jannet.de "/opt/ytools/bin/git-srv-admin.sh -j create-personal-project $(RPM_PROJECT)"
 	git remote set-url --push origin $(REMOTE_GIT_URL)
 	git push --set-upstream origin master
 	git push --all $(REMOTE_GIT_URL)
 
 git-import: git-init git-config
 	git add -A
-	git commit -am "initial checkin"
+	git status || git commit -am "initial checkin"
 
 git-init-remote: git-import git-clone-to-remote
 
 git-descr: $(GIT_DESCR)
 
 projects-%:
-	python $(MOD_SCRIPT_DIR)/build.py $* $(PROJECT)
+	python $(MOD_SCRIPT_DIR)/build.py $* $(RPM_PROJECT)
 
 install-deps-devel:
 	sudo zypper in $(shell echo $(RPM_REQUIRES_DEVEL) | sed "s/ *= */-/g; s/ [^ ]\+-__NEXT_VERSION__//")