diff --git a/make/projects-dir-minimal.mk b/make/projects-dir-minimal.mk
index f316fe0e..84a92c75 100644
--- a/make/projects-dir-minimal.mk
+++ b/make/projects-dir-minimal.mk
@@ -42,7 +42,7 @@ $(JWBDIR):
 all: link-makefile.done
 link-makefile.done: | $(JWBDIR)
 	[ -L $(PROJECTS_MAKEFILE_NAME) ] || \
-		ln -sf `find $(JWBDIR) -type f -print0 | xargs -0 grep -l some-random-string-to-id-this-makefile` \
+		ln -sf `find $(JWBDIR) -name '*.mk' -print0 | xargs -0 grep -l some-random-string-to-id-this-makefile` \
 			$(PROJECTS_MAKEFILE_NAME)
 	touch $@
 clean: clean.link-makefile
diff --git a/scripts/pgit.sh b/scripts/pgit.sh
index 94a4b6f2..78dc9d96 100644
--- a/scripts/pgit.sh
+++ b/scripts/pgit.sh
@@ -31,7 +31,7 @@ config()
 	[ "$pdir" ] || {
 		# guess pdir
 		pdir=`pwd`
-		while [ `cat $pdir/CVS/Repository 2>/dev/null` != proj ]; do
+		while [ ! -r Makefile ] || ! grep -q some-random-string-to-id-this-makefile Makefile; do
 			[ "$pdir" = / ] && fatal "didn't find \"proj\" in directory components"
 			pdir=`dirname $pdir`
 		done
@@ -96,10 +96,6 @@ commit()
 		fi
 		run_git -C $d commit "$@"
 	done
-
-	if [ "$do_cvs" = true -a -d CVS ]; then
-		cvs commit "$@"
-	fi
 )}
 
 clone()