diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index e117d457..f653a3a0 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -305,11 +305,12 @@ clean.ssh-wrapper:
 	rm -f $(SSH_WRAPPER_SH)
 clean: clean.ssh-wrapper
 
-cvs-check-user:
+define check_cvs_user
 	@if ! grep -q ":ext:$(JANWARE_USER)@" CVS/Root; then \
 		echo "Wrong username in CVS/Root, change that to: $(CVSROOT)" ;\
 		exit 1; \
 	fi
+endef
 
 cvsdir.done: $(SSH_WRAPPER_SH)
 	if [ ! -d CVS ]; then \
@@ -320,7 +321,8 @@ cvsdir.done: $(SSH_WRAPPER_SH)
 	fi
 	touch $@
 
-cvs-update.done: cvsdir.done $(SSH_WRAPPER_SH) cvs-check-user
+cvs-update.done: cvsdir.done $(SSH_WRAPPER_SH)
+	$(check_cvs_user)
 	cvs update -dP Makefile $(shell $(CVS_ADMIN_SH) list-projects)
 	touch $@