diff --git a/.cvsignore b/.cvsignore
index f2b6d9dd..df090ee5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,6 @@
 .bzr*
 .darcs*
-.git
+.git*
 .hg*
 _darcs
 B
diff --git a/Makefile b/Makefile
index 63edb06d..578c5f83 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,16 @@ all mostlyclean clean distclean maintainer-clean:
 dist: distclean
 	false
 
+
+CVS_ROOT := $(shell cat CVS/Root)
+CVS_REPO := $(shell cat CVS/Repository)
+
+cvs-info:
+	@echo 'CVS info: $(CVS_ROOT) $(CVS_REPO)'; false
+
 cvs-admin-ko:
 	cvs admin -ko .
-	cvs update -P -d
-
+	cvs -q -z6 update -P -d
 
 # automatically generate ChangeLog from CVS
 ChangeLog: ChangeLog.cvs
@@ -29,10 +35,7 @@ ChangeLog: ChangeLog.cvs
 ChangeLog.cvs:
 	perl $(srcdir)/scripts/cvs2cl.pl --utc -f ChangeLog.cvs
 
-ChangeLog.cvsps:
-	cvsps > $@
-
 
 .PHONY: all mostlyclean clean distclean maintainer-clean
-.PHONY: dist cvs-admin-ko ChangeLog ChangeLog.cvs
+.PHONY: dist cvs-info cvs-admin-ko ChangeLog ChangeLog.cvs