diff --git a/make/topdir.mk b/make/topdir.mk
index 2420efbe..1e6d9241 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -18,6 +18,7 @@ endif
 
 PROJECT_DESCR                = $(TOPDIR)/make/project.conf
 GIT_DESCR                    = $(TOPDIR)/.git/description
+GIT_MAIN_BRANCH             ?= master
 
 OPT_JANWARE_PROJECT         ?= -j
 PKG_MANAGER_SH              ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found)
@@ -145,7 +146,7 @@ git-config:
 git-clone-to-remote:
 	ssh $(JANWARE_USER)@git.janware.com "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(PROJECT)"
 	make git-config
-	git push --set-upstream origin master
+	git push --set-upstream origin $(GIT_MAIN_BRANCH)
 	git push --all $(REMOTE_GIT_URL)
 	make git-update-project-description
 
@@ -194,6 +195,16 @@ git-ssh-%:
 	bash -c "`git remote get-url --push $* | sed 's|ssh://||; s|\([^/]\+\)/\(.*\)|LC_CDPATH=/\2 ssh -o SendEnv=LC_CDPATH \1|'`"
 git-ssh: git-ssh-origin
 
+git-pull-maintainer:
+	make git-pull-$(call proj_query,getval global jw-maintainer)
+
+git-pull-%:
+	if [ "$*" = "$(JANWARE_USER)" ]; then \
+		git pull origin $(GIT_MAIN_BRANCH) ;\
+	else \
+		git pull --rebase --autostash jw-$* $(GIT_MAIN_BRANCH) ;\
+	fi
+
 pkg-manager-refresh:
 	$(PKG_MANAGER_SH) refresh $(DASH_Y)