diff --git a/Makefile.in b/Makefile.in
index 6733118..a523475 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,8 +58,8 @@ AUTOLOAD=--eval '(let ((generated-autoload-file (expand-file-name "$@"))) \
   (save-buffers-kill-emacs t))'
 DESCEND=test -z "$(subdirs)" || (OLDPWD="`pwd`";for i in ""$(subdirs);do cd $$i;echo "Descending into `pwd`";$(MAKE) 'DESTDIR=$(DESTDIR)' PACKAGE=$(PACKAGE) $@ || exit $$?;cd "$$OLDPWD";echo "Ascending into $$OLDPWD";done)
 
-CVSFILES=autogen.sh .cvsignore doc/.cvsignore preview/.cvsignore \
-	preview/latex/.cvsignore README.CVS
+GITFILES=autogen.sh .gitignore doc/.gitignore preview/.gitignore \
+	preview/latex/.gitignore README.GIT
 
 .SUFFIXES: .el .elc .texi
 
@@ -72,7 +72,7 @@ FTPDIR = $(DIST_PREFIX)/ftp
 WWWDIR = $(DIST_PREFIX)/www
 XEMACS_BUILD_DIR = xemacs-build
 PREVIEW_BUILD_DIR = preview-build
-COMMITTER="David Kastrup  <dak@gnu.org>"
+COMMITTER="`git config user.name`  \<`git config user.email`\>"
 RPMROOT = /usr/src/redhat
 RPM_SIGN = --sign
 
@@ -215,7 +215,7 @@ install-startup:
 
 install-el:
 	-$(MKINSTALLDIRS) $(DESTDIR)$(lispdir)
-	rm -f $(DESTDIR)$(packagelispdir)/tex-site.el # Remove old (CVS-version) mistakes
+	rm -f $(DESTDIR)$(packagelispdir)/tex-site.el # Remove old (Git-version) mistakes
 	test ! -f $(DESTDIR)$(lispdir)/tex-site.el || { \
 	   if grep -q "tex-site.*Don't edit." $(DESTDIR)$(lispdir)/tex-site.el; then \
 	    echo "Overwriting old tex-site.el" ; \
@@ -331,6 +331,8 @@ wc:
 # 
 # 1) release-commit TAG=<tag> COMMITTER=<committer>
 #    Tag the release.
+#    Pass `COMMITTER=<committer>' argument only if it is different from 
+#    your git name and email.
 #    
 # 2) dist TAG=<tag>
 #    Create the tar ball and other release files and put them into $FTPDIR.
@@ -362,26 +364,27 @@ check-tag:
 	@if [ "X$(TAG)" = "X" ]; then echo "*** Error: No TAG ***"; exit 1; fi
 
 release-commit: check-tag
-	@echo "Tagging release $(TAG) in CVS ..."
+	@echo "Tagging release $(TAG) in Git ..."
 	sleep 5
 	mv ChangeLog ChangeLog.old
-	echo `date "+%Y-%m-%d "`" "${COMMITTER} > ChangeLog
+	echo `date "+%Y-%m-%d "`" ${COMMITTER}" > ChangeLog
 	echo >> ChangeLog
 	echo "	* Version" $(TAG) released. >> ChangeLog
 	echo >> ChangeLog
 	cat ChangeLog.old >> ChangeLog
-	cvs commit -m 'Release_$(TAG)' ChangeLog
-	cvs tag release_`echo $(TAG) | sed -e 's/[.]/_/g'`
+	git add ChangeLog
+	git commit -m 'Release_$(TAG)'
+	git tag release_`echo $(TAG) | sed -e 's/[.]/_/g'`
+	rm ChangeLog.old
 
 tar-ball: doc/Makefile
 	test ! -d auctex-$(TAG) || rm -r auctex-$(TAG)
 	mkdir auctex-$(TAG)
 # Use TAG_EXPORT if set (for snapshots)
-	cvs export -d auctex-$(TAG) \
-          `echo $${TAG_EXPORT:=$(TAG)} | \
+	git archive `echo $${TAG_EXPORT:=$(TAG)} | \
 	  sed -e '/^\([-0-9]*[0-9]\)[-a-z]*$$/s//-D \1/' \
-              -e '/[.]/{s/^/-r release_/;s/[.]/_/g}'` auctex
-	cd auctex-$(TAG) && AUCTEXVERSION=$(TAG) AUCTEXDATE=$(AUCTEXDATE) ./autogen.sh && rm $(CVSFILES)
+              -e '/[.]/{s/^/release_/;s/[.]/_/g}'` | tar -xC auctex-$(TAG)
+	cd auctex-$(TAG) && AUCTEXVERSION=$(TAG) AUCTEXDATE=$(AUCTEXDATE) ./autogen.sh && rm $(GITFILES)
 	chmod -R go-w+rX auctex-$(TAG)
 	rm -rf $(FTPDIR)
 	mkdir -p $(FTPDIR)
@@ -512,10 +515,10 @@ preview-ball: check-tag
 	test ! -d $(PREVIEW_BUILD_DIR) || rm -r $(PREVIEW_BUILD_DIR)
 	mkdir $(PREVIEW_BUILD_DIR)
 # Use TAG_EXPORT if set (for snapshots)
-	cvs export -d $(PREVIEW_BUILD_DIR) \
-          `echo $${TAG_EXPORT:=$(TAG)} | \
+	git archive `echo $${TAG_EXPORT:=$(TAG)} | \
 	  sed -e '/^\([-0-9]*[0-9]\)[-a-z]*$$/s//-D \1/' \
-              -e '/[.]/{s/^/-r release_/;s/[.]/_/g}'` auctex/preview/latex
+              -e '/[.]/{s/^/release_/;s/[.]/_/g}'` preview/latex | tar \
+	   -xC $(PREVIEW_BUILD_DIR) --strip-components=2
 	cd $(PREVIEW_BUILD_DIR) && make -f ../preview/latex/Makefile preview.ins preview.pdf
 	chmod -R go-w+rX $(PREVIEW_BUILD_DIR)
 	test -d $(FTPDIR) || mkdir -p $(FTPDIR)
diff --git a/auctex.spec b/auctex.spec
index 3d5f7bc..a482661 100644
--- a/auctex.spec
+++ b/auctex.spec
@@ -104,7 +104,7 @@ probably best solved by not installing this package).
 %setup
 
 %build
-# The below will make the package build from a tar straight from CVS
+# The below will make the package build from a tar straight from Git
 # NOT RECOMMENDED, but useful for testing!
 test -f ./configure || ./autogen.sh
 %configure --with-emacs INSTALL_INFO=: --without-texmf-dir
diff --git a/bib-cite.el b/bib-cite.el
index ad6f166..5909276 100644
--- a/bib-cite.el
+++ b/bib-cite.el
@@ -38,8 +38,8 @@
 
 ;; New versions of this package (if they exist) may be found at:
 ;;   http://people.debian.org/~psg/elisp/bib-cite.el
-;; and in AUCTeX's CVS archive at
-;;   http://savannah.gnu.org/cgi-bin/viewcvs/auctex/auctex/
+;; and in AUCTeX's Git archive at
+;;   http://git.savannah.gnu.org/cgit/auctex.git
 
 ;; Operating Systems:
 ;;  Works in unix, DOS and OS/2.  Developped under Linux.