diff --git a/ChangeLog b/ChangeLog
index fa0a39bf3..1f1e634aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2006-12-26  Jim Meyering  <jim@meyering.net>
+
+	* Makefile.maint (VC-tag): Define, so as to gpg-sign each release
+	tag, using the release version number as the message.
+	(vc-dist): Use $(VC-tag), rather than "$(VC) tag".
+
+2006-12-24  Jim Meyering  <jim@meyering.net>
+
+	* Makefile.maint (my-distcheck): Don't *configure* with
+	restrictive CFLAGS ('-Werror -ansi -pedantic -Wno-long-long'),
+	since it ends up provoking errors in generation of inttypes.h
+	on an Ubuntu edgy-based system.  That leads to compilation
+	failure due to e.g., imaxabs redefinition.
+	Instead, configure with default CFLAGS, and compile the
+	package with restrictive CFLAGS.
+
 2006-12-21  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* NEWS: dd bs= operands now silently override later ibs= and obs=,
diff --git a/Makefile.maint b/Makefile.maint
index 893b9ad74..c33d9d235 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -32,6 +32,7 @@ GZIP_ENV = '--no-name --best $(gzip_rsyncable)'
 CVS = cvs
 GIT = git
 VC = $(GIT)
+VC-tag = git-tag -s -m '$(VERSION)'
 
 CVS_LIST = build-aux/vc-list-files
 
@@ -494,7 +495,7 @@ maintainer-distcheck:
 # checks fail.  Also, make sure the NEWS file is up-to-date.
 # FIXME: use dist-hook/my-dist like distcheck-hook/my-distcheck.
 vc-dist: $(local-check) cvs-check maintainer-distcheck
-	$(VC) tag $(this-vc-tag)
+	$(VC-tag) $(this-vc-tag)
 	$(MAKE) dist
 
 # Use this to make sure we don't run these programs when building
@@ -532,7 +533,7 @@ my-distcheck: $(local-check) $(release_archive_dir)/$(prev-tgz)
 	cd $(t)/$(distdir)				\
 	  && (cd src && patch -V never --fuzz=0 <c99-to-c89.diff) \
 	  && ./configure --disable-largefile		\
-	      CFLAGS='-Werror -ansi -pedantic -Wno-long-long' \
+	       CFLAGS='-Werror -ansi -pedantic -Wno-long-long' \
 	  && $(MAKE)
 	-rm -rf $(t)
 	@echo "========================"; \