diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 3866381..79e1e30 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Generate a release announcement message.
 
-my $VERSION = '2011-11-09 21:30'; # UTC
+my $VERSION = '2011-12-21 00:43'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -44,7 +44,7 @@ sub usage ($)
   my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
   if ($exit_code != 0)
     {
-      print $STREAM "Try `$ME --help' for more information.\n";
+      print $STREAM "Try \"$ME --help\" for more information.\n";
     }
   else
     {
@@ -106,7 +106,7 @@ sub sizes (@)
       my $t = `$cmd`;
       # FIXME-someday: give a better diagnostic, a la $PROCESS_STATUS
       $@
-        and (warn "$ME: command failed: `$cmd'\n"), $fail = 1;
+        and (warn "$ME: command failed: \"$cmd\"\n"), $fail = 1;
       chomp $t;
       $t =~ s/^([\d.]+[MkK]).*/${1}B/;
       $res{$f} = $t;
@@ -222,9 +222,9 @@ sub print_news_deltas ($$$)
   close NEWS;
 
   $in_items
-    or die "$ME: $news_file: no matching lines for `$curr_version'\n";
+    or die "$ME: $news_file: no matching lines for \"$curr_version\"\n";
   $found_news
-    or die "$ME: $news_file: no news item found for `$curr_version'\n";
+    or die "$ME: $news_file: no news item found for \"$curr_version\"\n";
 }
 
 sub print_changelog_deltas ($$)
@@ -280,7 +280,7 @@ sub print_changelog_deltas ($$)
 
   my $cmd = "cvs -n diff -u -r$prev_cvs_tag -rHEAD @reordered";
   open DIFF, '-|', $cmd
-    or die "$ME: cannot run `$cmd': $!\n";
+    or die "$ME: cannot run \"$cmd\": $!\n";
   # Print two types of lines, making minor changes:
   # Lines starting with `+++ ', e.g.,
   # +++ ChangeLog   22 Feb 2003 16:52:51 -0000      1.247
@@ -310,7 +310,7 @@ sub print_changelog_deltas ($$)
   # The exit code should be 1.
   # Allow in case there are no modified ChangeLog entries.
   $? == 256 || $? == 128
-    or warn "$ME: warning: `cmd' had unexpected exit code or signal ($?)\n";
+    or warn "$ME: warning: \"cmd\" had unexpected exit code or signal ($?)\n";
 }
 
 sub get_tool_versions ($$)
@@ -410,7 +410,7 @@ sub get_tool_versions ($$)
         . "in the gnulib source directory.\n"), $fail = 1;
 
   exists $valid_release_types{$release_type}
-    or (warn "$ME: `$release_type': invalid release type\n"), $fail = 1;
+    or (warn "$ME: \"$release_type\": invalid release type\n"), $fail = 1;
 
   @ARGV
     and (warn "$ME: too many arguments:\n", join ("\n", @ARGV), "\n"),
@@ -505,7 +505,7 @@ then run this command to import it:
 
   gpg --keyserver keys.gnupg.net --recv-keys $gpg_key_id
 
-and rerun the \`gpg --verify' command.
+and rerun the \"gpg --verify\" command.
 EOF
 
   my @tool_versions = get_tool_versions (address@hidden, $gnulib_version);
diff --git a/build-aux/compile b/build-aux/compile
index bac481c..3348ec7 100755
--- a/build-aux/compile
+++ b/build-aux/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2010-11-15.09; # UTC
+scriptversion=2011-12-20.19; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
 # Foundation, Inc.
@@ -196,7 +196,7 @@ eat=
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try \"$0 --help\" for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -208,7 +208,7 @@ Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 
 If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
+right script to run: please start by reading the file "INSTALL".
 
 Report bugs to <address@hidden>.
 EOF
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 8152efd..ddfe059 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011 Free Software Foundation, Inc.
 
-timestamp='2011-11-11'
+timestamp='2011-12-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@ me=`echo "$0" | sed -e 's,.*/,,'`
 usage="\
 Usage: $0 [OPTION]
 
-Output the configuration name of the system \`$me' is run on.
+Output the configuration name of the system \"$me\" is run on.
 
 Operation modes:
   -h, --help         print this help, then exit
@@ -64,7 +64,7 @@ This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
-Try \`$me --help' for more information."
+Try \"$me --help\" for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
diff --git a/build-aux/config.sub b/build-aux/config.sub
index e76eaf4..5bedf48 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011 Free Software Foundation, Inc.
 
-timestamp='2011-11-11'
+timestamp='2011-12-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -83,7 +83,7 @@ This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
-Try \`$me --help' for more information."
+Try \"$me --help\" for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
@@ -350,7 +350,7 @@ case $basic_machine in
 	  ;;
 	# Object if more than one company name word.
 	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		echo Invalid configuration \"$1\": machine \"$basic_machine\" not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
@@ -1285,7 +1285,7 @@ case $basic_machine in
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		echo Invalid configuration \"$1\": machine \"$basic_machine\" not recognized 1>&2
 		exit 1
 		;;
 esac
@@ -1497,7 +1497,7 @@ case $os in
 	*)
 		# Get rid of the `-' at the beginning of $os.
 		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		echo Invalid configuration \"$1\": system \"$os\" not recognized 1>&2
 		exit 1
 		;;
 esac
diff --git a/build-aux/depcomp b/build-aux/depcomp
index bd0ac08..4e6aee0 100755
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2011-12-21.00; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
 # 2011 Free Software Foundation, Inc.
@@ -28,7 +28,7 @@ scriptversion=2011-12-04.11; # UTC
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try \"$0 --help\" for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,8 +40,8 @@ as side-effects.
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by "PROGRAMS ARGS".
+  object      Object file output by "PROGRAMS ARGS".
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
   tmpdepfile  Temporary file to use when outputting dependencies.
diff --git a/build-aux/elisp-comp b/build-aux/elisp-comp
index ecc6b15..13e228f 100755
--- a/build-aux/elisp-comp
+++ b/build-aux/elisp-comp
@@ -2,7 +2,7 @@
 # Copyright (C) 1995, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
 # Foundation, Inc.
 
-scriptversion=2010-02-06.18; # UTC
+scriptversion=2011-12-20.19; # UTC
 
 # Franc,ois Pinard <address@hidden>, 1995.
 #
@@ -30,16 +30,16 @@ scriptversion=2010-02-06.18; # UTC
 
 case $1 in
   '')
-     echo "$0: No files.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No files.  Try \"$0 --help\" for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: elisp-comp [--help] [--version] FILES...
 
-This script byte-compiles all `.el' files listed as FILES using GNU
-Emacs, and put the resulting `.elc' files into the current directory,
-so disregarding the original directories used in `.el' arguments.
+This script byte-compiles all ".el" files listed as FILES using GNU
+Emacs, and put the resulting ".elc" files into the current directory,
+so disregarding the original directories used in ".el" arguments.
 
 This script manages in such a way that all Emacs LISP files to
 be compiled are made visible between themselves, in the event
diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index c8abd55..caa6138 100755
--- a/build-aux/gendocs.sh
+++ b/build-aux/gendocs.sh
@@ -2,7 +2,7 @@
 # gendocs.sh -- generate a GNU manual in many formats.  This script is
 #   mentioned in maintain.texi.  See the help message below for usage details.
 
-scriptversion=2011-04-08.14
+scriptversion=2011-12-20.16
 
 # Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
@@ -140,8 +140,8 @@ while test $# -gt 0; do
     --html) shift; htmlarg=$1;;
     --texi2html) use_texi2html=1;;
     -*)
-      echo "$0: Unknown option \`$1'." >&2
-      echo "$0: Try \`--help' for more information." >&2
+      echo "$0: Unknown option \"$1\"." >&2
+      echo "$0: Try \"--help\" for more information." >&2
       exit 1;;
     *)
       if test -z "$PACKAGE"; then
@@ -149,7 +149,7 @@ while test $# -gt 0; do
       elif test -z "$MANUAL_TITLE"; then
         MANUAL_TITLE=$1
       else
-        echo "$0: extra non-option argument \`$1'." >&2
+        echo "$0: extra non-option argument \"$1\"." >&2
         exit 1
       fi;;
   esac
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index c7a58af..cc7eee5 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2011-11-13.13; # UTC
+scriptversion=2011-12-21.00; # UTC
 
 # Copyright (C) 2007-2011 Free Software Foundation, Inc.
 #
@@ -98,8 +98,8 @@ while test $# -gt 0; do
     --version) echo "$version"; exit 0;;
     --prefix) shift; prefix="$1";;
     -*)
-      echo "$0: Unknown option \`$1'." >&2
-      echo "$0: Try \`--help' for more information." >&2
+      echo "$0: Unknown option \"$1\"." >&2
+      echo "$0: Try \"--help\" for more information." >&2
       exit 1;;
     *)
       if test -z "$tarball_version_file"; then
@@ -107,7 +107,7 @@ while test $# -gt 0; do
       elif test -z "$tag_sed_script"; then
         tag_sed_script="$1"
       else
-        echo "$0: extra non-option argument \`$1'." >&2
+        echo "$0: extra non-option argument \"$1\"." >&2
         exit 1
       fi;;
   esac
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 40a8035..8121477 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2011-11-02 07:53'; # UTC
+my $VERSION = '2011-12-21 00:47'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -47,7 +47,7 @@ sub usage ($)
   my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
   if ($exit_code != 0)
     {
-      print $STREAM "Try `$ME --help' for more information.\n";
+      print $STREAM "Try \"$ME --help\" for more information.\n";
     }
   else
     {
@@ -196,7 +196,7 @@ sub parse_amend_file($)
   my @cmd = (qw (git log --log-size),
              '--pretty=format:%H:%ct  %an  <%ae>%n%n'.$format_string, @ARGV);
   open PIPE, '-|', @cmd
-    or die ("$ME: failed to run `". quoted_cmd (@cmd) ."': $!\n"
+    or die ("$ME: failed to run \"". quoted_cmd (@cmd) ."\": $!\n"
             . "(Is your Git too old?  Version 1.5.1 or later is required.)\n");
 
   my $prev_date_line = '';
diff --git a/build-aux/gnupload b/build-aux/gnupload
index edb4b56..3ab8892 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Sign files and upload them.
 
-scriptversion=2010-05-23.15; # UTC
+scriptversion=2011-12-20.19; # UTC
 
 # Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
@@ -57,7 +57,7 @@ Options:
   --version                output version information and exit
 
 If --symlink-regex is given without EXPR, then the link target name
-is created by replacing the version information with \`-latest', e.g.:
+is created by replacing the version information with \"-latest\", e.g.:
 
   foo-1.3.4.tar.gz -> foo-latest.tar.gz
 
@@ -170,7 +170,7 @@ while test -n "$1"; do
       break
       ;;
     -*)
-      echo "$0: Unknown option \`$1', try \`$0 --help'" 1>&2
+      echo "$0: Unknown option \"$1\", try \"$0 --help\"" 1>&2
       exit 1
       ;;
     esac
@@ -219,7 +219,7 @@ else
   for file
   do
     if test ! -f $file; then
-      echo "$0: Cannot find \`$file'" 1>&2
+      echo "$0: Cannot find \"$file\"" 1>&2
       exit 1
     elif test -n "$symlink_expr"; then
       linkname=`echo $file | sed "$symlink_expr"`
diff --git a/build-aux/install-sh b/build-aux/install-sh
index 64c4b3e..92a5b2d 100755
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2011-12-21.00; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
diff --git a/build-aux/mdate-sh b/build-aux/mdate-sh
index 60dc485..8fefee1 100755
--- a/build-aux/mdate-sh
+++ b/build-aux/mdate-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
 
-scriptversion=2010-08-21.06; # UTC
+scriptversion=2011-12-23.00; # UTC
 
 # Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009, 2010
 # Free Software Foundation, Inc.
@@ -40,7 +40,7 @@ fi
 
 case $1 in
   '')
-     echo "$0: No file.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No file.  Try \"$0 --help\" for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -136,7 +136,7 @@ do
   esac
 done
 
-test -n "$month" || error "failed parsing \`$ls_command /' output"
+test -n "$month" || error "failed parsing \"$ls_command /\" output"
 
 # Get the extended ls output of the file or directory.
 set dummy x`eval "$ls_command \"\\\$save_arg1\""`
diff --git a/build-aux/missing b/build-aux/missing
index 28055d2..08440a4 100755
--- a/build-aux/missing
+++ b/build-aux/missing
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-12-21.00; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
 # 2008, 2009 Free Software Foundation, Inc.
@@ -26,7 +26,7 @@ scriptversion=2009-04-28.21; # UTC
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try \"$0 --help\" for more information"
   exit 1
 fi
 
@@ -65,7 +65,7 @@ case $1 in
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+Handle \"PROGRAM [ARGUMENT]...\" for when PROGRAM is missing, or return an
 error status if there is no known handling for PROGRAM.
 
 Options:
@@ -74,21 +74,21 @@ Options:
   --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
+  aclocal      touch file \"aclocal.m4\"
+  autoconf     touch file \"configure\"
+  autoheader   touch file \"config.h.in\"
   autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
+  automake     touch all \"Makefile.in\" files
+  bison        create \"y.tab.[ch]\", if possible, from existing .[ch]
+  flex         create \"lex.yy.c\", if possible, from existing .c
   help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
+  lex          create \"lex.yy.c\", if possible, from existing .c
   makeinfo     touch the output file
   tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  yacc         create \"y.tab.[ch]\", if possible, from existing .[ch]
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes \"gnu-\", \"gnu\", and
+\"g\" are ignored when checking the name.
 
 Send bug reports to <address@hidden>."
     exit $?
@@ -100,8 +100,8 @@ Send bug reports to <address@hidden>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: Unknown \"$1\" option"
+    echo 1>&2 "Try \"$0 --help\" for more information"
     exit 1
     ;;
 
@@ -124,7 +124,7 @@ case $1 in
 
   tar*)
     if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
+       echo 1>&2 "ERROR: \"tar\" requires --run"
        exit 1
     elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
        exit 1
@@ -149,27 +149,27 @@ esac
 case $program in
   aclocal*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
+WARNING: \"$1\" is $msg.  You should only need it if
+         you modified \"acinclude.m4\" or \"${configure_ac}\".  You might want
+         to install the \"Automake\" and \"Perl\" packages.  Grab them from
          any GNU archive site."
     touch aclocal.m4
     ;;
 
   autoconf*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+WARNING: \"$1\" is $msg.  You should only need it if
+         you modified \"${configure_ac}\".  You might want to install the
+         \"Autoconf\" and \"GNU m4\" packages.  Grab them from any GNU
          archive site."
     touch configure
     ;;
 
   autoheader*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+WARNING: \"$1\" is $msg.  You should only need it if
+         you modified \"acconfig.h\" or \"${configure_ac}\".  You might want
+         to install the \"Autoconf\" and \"GNU m4\" packages.  Grab them
          from any GNU archive site."
     files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
     test -z "$files" && files="config.h"
@@ -186,9 +186,9 @@ WARNING: \`$1' is $msg.  You should only need it if
 
   automake*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
+WARNING: \"$1\" is $msg.  You should only need it if
+         you modified \"Makefile.am\", \"acinclude.m4\" or \"${configure_ac}\".
+         You might want to install the \"Automake\" and \"Perl\" packages.
          Grab them from any GNU archive site."
     find . -type f -name Makefile.am -print |
 	   sed 's/\.am$/.in/' |
@@ -197,10 +197,10 @@ WARNING: \`$1' is $msg.  You should only need it if
 
   autom4te*)
     echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
+WARNING: \"$1\" is needed, but is $msg.
          You might have modified some files without having the
          proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
+         You can get \"$1\" as part of \"Autoconf\" from any GNU
          archive site."
 
     file=`echo "$*" | sed -n "$sed_output"`
@@ -220,10 +220,10 @@ WARNING: \`$1' is needed, but is $msg.
 
   bison*|yacc*)
     echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
+WARNING: \"$1\" $msg.  You should only need it if
+         you modified a \".y\" file.  You may need the \"Bison\" package
          in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
+         \"Bison\" from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
         eval LASTARG="\${$#}"
@@ -250,10 +250,10 @@ WARNING: \`$1' $msg.  You should only need it if
 
   lex*|flex*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
+WARNING: \"$1\" is $msg.  You should only need it if
+         you modified a \".l\" file.  You may need the \"Flex\" package
          in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
+         \"Flex\" from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
         eval LASTARG="\${$#}"
@@ -273,10 +273,10 @@ WARNING: \`$1' is $msg.  You should only need it if
 
   help2man*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
+WARNING: \"$1\" is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
+	 \"Help2man\" package in order for those modifications to take
+	 effect.  You can get \"Help2man\" from any GNU archive site."
 
     file=`echo "$*" | sed -n "$sed_output"`
     test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@@ -291,12 +291,12 @@ WARNING: \`$1' is $msg.  You should only need it if
 
   makeinfo*)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
+WARNING: \"$1\" is $msg.  You should only need it if
+         you modified a \".texi\" or \".texinfo\" file, or any other file
          indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
+         call might also be the consequence of using a buggy \"make\" (AIX,
+         DU, IRIX).  You might want to install the \"Texinfo\" package or
+         the \"GNU make\" package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n "$sed_output"`
     test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@@ -347,7 +347,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
 
     echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
+WARNING: I can't seem to be able to run \"tar\" with the given arguments.
          You may want to install GNU tar or Free paxutils, or check the
          command line arguments."
     exit 1
@@ -355,12 +355,12 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
 
   *)
     echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
+WARNING: \"$1\" is needed, and is $msg.
          You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
+         proper tools for further handling them.  Check the \"README\" file,
          it often tells you about the needed prerequisites for installing
          this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
+         some other package would contain this missing \"$1\" program."
     exit 1
     ;;
 esac
diff --git a/build-aux/mkinstalldirs b/build-aux/mkinstalldirs
index 4191a45..8c61a31 100755
--- a/build-aux/mkinstalldirs
+++ b/build-aux/mkinstalldirs
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-12-20.19; # UTC
 
 # Original author: Noah Friedman <address@hidden>
 # Created: 1993-05-16
diff --git a/build-aux/move-if-change b/build-aux/move-if-change
index e7ba25e..500c29a 100755
--- a/build-aux/move-if-change
+++ b/build-aux/move-if-change
@@ -2,7 +2,7 @@
 # Like mv $1 $2, but if the files are the same, just delete $1.
 # Status is zero if successful, nonzero otherwise.
 
-VERSION='2011-01-28 20:09'; # UTC
+VERSION='2011-12-20 19:47'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -32,7 +32,7 @@ If SOURCE is different than DEST, then move it to DEST; else remove SOURCE.
   --help     display this help and exit
   --version  output version information and exit
 
-The variable CMPPROG can be used to specify an alternative to \`cmp'.
+The variable CMPPROG can be used to specify an alternative to \"cmp\".
 
 Report bugs to <address@hidden>."
 
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index b8f5a26..b395e69 100755
--- a/build-aux/useless-if-before-free
+++ b/build-aux/useless-if-before-free
@@ -4,7 +4,7 @@ eval '(exit $?0)' && eval 'exec perl -wST "$0" ${1+"$@"}'
 # Detect instances of "if (p) free (p);".
 # Likewise "if (p != 0)", "if (0 != p)", or with NULL; and with braces.
 
-my $VERSION = '2011-04-20 13:43'; # UTC
+my $VERSION = '2011-12-20 19:48'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -47,7 +47,7 @@ sub usage ($)
   my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
   if ($exit_code != 0)
     {
-      print $STREAM "Try `$ME --help' for more information.\n";
+      print $STREAM "Try \"$ME --help\" for more information.\n";
     }
   else
     {
@@ -62,7 +62,7 @@ detect free-like functions named FOO and BAR.
 OPTIONS:
 
    --list       print only the name of each matching FILE (\\0-terminated)
-   --name=N     add name N to the list of \`free\'-like functions to detect;
+   --name=N     add name N to the list of "free"-like functions to detect;
                   may be repeated
 
    --help       display this help and exit
@@ -125,7 +125,7 @@ sub is_NULL ($)
   foreach my $file (@ARGV)
     {
       open FH, '<', $file
-        or (warn "$ME: can't open `$file' for reading: $!\n"),
+        or (warn "$ME: can't open \"$file\" for reading: $!\n"),
           $err = EXIT_ERROR, next;
       while (defined (my $line = <FH>))
         {
diff --git a/build-aux/ylwrap b/build-aux/ylwrap
index 9253635..652ec83 100755
--- a/build-aux/ylwrap
+++ b/build-aux/ylwrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2011-08-25.18; # UTC
+scriptversion=2011-12-23.00; # UTC
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
 # 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
@@ -32,7 +32,7 @@ scriptversion=2011-08-25.18; # UTC
 
 case "$1" in
   '')
-    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
+    echo "$0: No files given.  Try \"$0 --help\" for more information." 1>&2
     exit 1
     ;;
   --basedir)
diff --git a/check-module b/check-module
index a302f1b..dea52cc 100755
--- a/check-module
+++ b/check-module
@@ -60,7 +60,7 @@ sub parse_module_file ($)
   my ($module_file) = @_;
 
   open FH, '<', $module_file
-    or die "$ME: can't open `$module_file' for reading: $!\n";
+    or die "$ME: can't open \"$module_file\" for reading: $!\n";
 
   my %file_set;
   my %dep_set;
@@ -130,7 +130,7 @@ sub usage ($)
   my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
   if ($exit_code != 0)
     {
-      print $STREAM "Try `$ME --help' for more information.\n";
+      print $STREAM "Try \"$ME --help\" for more information.\n";
     }
   else
     {
@@ -138,7 +138,7 @@ sub usage ($)
 Usage: $ME [OPTIONS] FILE...
 
 Read a module description file and derive the set of files
-included directly by any .c or .h file listed in the `Files:' section.
+included directly by any .c or .h file listed in the "Files:" section.
 Take the union of all such sets for any dependent modules.
 Then, compare that set with the set derived from the names
 listed in the various Files: sections.
@@ -172,7 +172,7 @@ sub find_included_lib_files ($)
 
   my %inc;
   open FH, '<', $file
-    or die "$ME: can't open `$file' for reading: $!\n";
+    or die "$ME: can't open \"$file\" for reading: $!\n";
 
   while (defined (my $line = <FH>))
     {
@@ -272,11 +272,10 @@ sub check_module ($)
 	    || exists $exempt_header{$i}
 	      and next;
 	  !exists $module_all_files{$lib_file} && -f "../lib/$i"
-	    and warn "$f: $i is `#include'd, but not "
+	    and warn "$f: $i is \"#include\"d, but not "
 	      . "listed in module's Files: section\n";
 	}
-      #my @t = sort keys %$inc;
-      #print "** $f: @t\n";
+      #my @t = sort keys %$inc;      #print "** $f: @t\n";
     }
 }
 
diff --git a/lib/argmatch.c b/lib/argmatch.c
index 6adbef6..b7bf716 100644
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -269,7 +269,7 @@ main (int argc, const char *const *argv)
     backup_type = XARGMATCH (program_name, argv[1],
                              backup_args, backup_vals);
 
-  printf ("The version control is `%s'\n",
+  printf ("The version control is \"%s\"\n",
           ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals));
 
   return 0;
diff --git a/lib/argp-help.c b/lib/argp-help.c
index ec7fcda..a169c42 100644
--- a/lib/argp-help.c
+++ b/lib/argp-help.c
@@ -1681,7 +1681,7 @@ _help (const struct argp *argp, const struct argp_state *state, FILE *stream,
   if (flags & ARGP_HELP_SEE)
     {
       __argp_fmtstream_printf (fs, dgettext (argp->argp_domain, "\
-Try `%s --help' or `%s --usage' for more information.\n"),
+Try \"%s --help\" or \"%s --usage\" for more information.\n"),
                                name, name);
       anything = 1;
     }
diff --git a/lib/getopt1.c b/lib/getopt1.c
index 3656802..b436b28 100644
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -141,11 +141,11 @@ main (int argc, char **argv)
           break;
 
         case 'c':
-          printf ("option c with value `%s'\n", optarg);
+          printf ("option c with value \"%s\"\n", optarg);
           break;
 
         case 'd':
-          printf ("option d with value `%s'\n", optarg);
+          printf ("option d with value \"%s\"\n", optarg);
           break;
 
         case '?':
diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 652b40a..5f90c4c 100644
--- a/lib/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -963,7 +963,7 @@ static void
 usage (int status)
 {
   if (status != EXIT_SUCCESS)
-    fprintf (stderr, "Try `%s --help' for more information.\n",
+    fprintf (stderr, "Try \"%s --help\" for more information.\n",
              program_name);
   else
     {
diff --git a/lib/xstrtol-error.c b/lib/xstrtol-error.c
index 52e712c..18b34a4 100644
--- a/lib/xstrtol-error.c
+++ b/lib/xstrtol-error.c
@@ -60,16 +60,16 @@ xstrtol_error (enum strtol_error err,
       abort ();
 
     case LONGINT_INVALID:
-      msgid = N_("invalid %s%s argument `%s'");
+      msgid = N_("invalid %s%s argument \"%s\"");
       break;
 
     case LONGINT_INVALID_SUFFIX_CHAR:
     case LONGINT_INVALID_SUFFIX_CHAR_WITH_OVERFLOW:
-      msgid = N_("invalid suffix in %s%s argument `%s'");
+      msgid = N_("invalid suffix in %s%s argument \"%s\"");
       break;
 
     case LONGINT_OVERFLOW:
-      msgid = N_("%s%s argument `%s' too large");
+      msgid = N_("%s%s argument \"%s\" too large");
       break;
     }
 
diff --git a/m4/alloca.m4 b/m4/alloca.m4
index a8744a8..8eafe99 100644
--- a/m4/alloca.m4
+++ b/m4/alloca.m4
@@ -65,7 +65,7 @@ AC_LIBSOURCES(alloca.c)
 AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.$ac_objext])dnl
 AC_DEFINE(C_ALLOCA, 1, [Define to 1 if using `alloca.c'.])
 
-AC_CACHE_CHECK(whether `alloca.c' needs Cray hooks, ac_cv_os_cray,
+AC_CACHE_CHECK(whether alloca.c needs Cray hooks, ac_cv_os_cray,
 [AC_EGREP_CPP(webecray,
 [#if defined CRAY && ! defined CRAY2
 webecray
diff --git a/m4/gc-random.m4 b/m4/gc-random.m4
index 3a21a6d..86ec928 100644
--- a/m4/gc-random.m4
+++ b/m4/gc-random.m4
@@ -61,15 +61,15 @@ AC_DEFUN([gl_GC_RANDOM],
   if test "$cross_compiling" != yes; then
     if test "$NAME_OF_RANDOM_DEVICE" != "no"; then
       AC_CHECK_FILE([$NAME_OF_RANDOM_DEVICE],,
-        AC_MSG_WARN([[Device `$NAME_OF_RANDOM_DEVICE' does not exist, consider to use --enable-random-device]]))
+        AC_MSG_WARN([[Device "$NAME_OF_RANDOM_DEVICE" does not exist, consider to use --enable-random-device]]))
     fi
     if test "$NAME_OF_PSEUDO_RANDOM_DEVICE" != "no"; then
       AC_CHECK_FILE([$NAME_OF_PSEUDO_RANDOM_DEVICE],,
-        AC_MSG_WARN([[Device `$NAME_OF_PSEUDO_RANDOM_DEVICE' does not exist, consider to use --enable-pseudo-random-device]]))
+        AC_MSG_WARN([[Device "$NAME_OF_PSEUDO_RANDOM_DEVICE" does not exist, consider to use --enable-pseudo-random-device]]))
     fi
     if test "$NAME_OF_NONCE_DEVICE" != "no"; then
       AC_CHECK_FILE([$NAME_OF_NONCE_DEVICE],,
-        AC_MSG_WARN([[Device `$NAME_OF_NONCE_DEVICE' does not exist, consider to use --enable-nonce-device]]))
+        AC_MSG_WARN([[Device "$NAME_OF_NONCE_DEVICE" does not exist, consider to use --enable-nonce-device]]))
     fi
   else
     AC_MSG_NOTICE([[Cross compiling, assuming random devices exists on the target host...]])
diff --git a/modules/userspec b/modules/userspec
index e528e69..3ded68a 100644
--- a/modules/userspec
+++ b/modules/userspec
@@ -1,5 +1,5 @@
 Description:
-Parse a `user:group' specifier (e.g. the first argument of chown utility).
+Parse a "user:group" specifier (e.g. the first argument of chown utility).
 
 Files:
 lib/userspec.c
diff --git a/tests/test-dirname.c b/tests/test-dirname.c
index 1ddf229..21067ed 100644
--- a/tests/test-dirname.c
+++ b/tests/test-dirname.c
@@ -149,14 +149,15 @@ main (void)
                  || (dirlen + 1 == strlen (dir) && dir[dirlen] == '.'))))
         {
           ok = false;
-          printf ("dir_name `%s': got `%s' len %d, expected `%s' len %ld\n",
+          printf ("dir_name \"%s\": got \"%s\" len %d,"
+                  " expected \"%s\" len %ld\n",
                   t->name, dir, dirlen,
                   t->dir, (unsigned long) strlen (t->dir));
         }
       if (strcmp (last, t->last))
         {
           ok = false;
-          printf ("last_component `%s': got `%s', expected `%s'\n",
+          printf ("last_component \"%s\": got \"%s\", expected \"%s\"\n",
                   t->name, last, t->last);
         }
       if (! (strcmp (base, t->base) == 0
@@ -165,21 +166,22 @@ main (void)
                      && ISSLASH (base[baselen])))))
         {
           ok = false;
-          printf ("base_name `%s': got `%s' len %d, expected `%s' len %ld\n",
+          printf ("base_name \"%s\": got \"%s\" len %d,"
+                  " expected \"%s\" len %ld\n",
                   t->name, base, baselen,
                   t->base, (unsigned long) strlen (t->base));
         }
       if (strcmp (stripped, t->stripped) || modified != t->modified)
         {
           ok = false;
-          printf ("strip_trailing_slashes `%s': got %s %s, expected %s %s\n",
+          printf ("strip_trailing_slashes \"%s\": got %s %s, expected %s %s\n",
                   t->name, stripped, modified ? "changed" : "unchanged",
                   t->stripped, t->modified ? "changed" : "unchanged");
         }
       if (t->absolute != absolute)
         {
           ok = false;
-          printf ("`%s': got %s, expected %s\n", t->name,
+          printf ("\"%s\": got %s, expected %s\n", t->name,
                   absolute ? "absolute" : "relative",
                   t->absolute ? "absolute" : "relative");
         }
diff --git a/tests/test-getpass.c b/tests/test-getpass.c
index 4657fb7..88ade2d 100644
--- a/tests/test-getpass.c
+++ b/tests/test-getpass.c
@@ -25,7 +25,7 @@ main (int argc, char *argv[])
 {
   char *pass = getpass ("Enter password: ");
 
-  printf ("The password is `%s'\n", pass);
+  printf ("The password is \"%s\"\n", pass);
 
   return 0;
 }
diff --git a/tests/test-iconvme.c b/tests/test-iconvme.c
index 38165f7..2f94168 100644
--- a/tests/test-iconvme.c
+++ b/tests/test-iconvme.c
@@ -66,9 +66,9 @@ int main (int ac, char *av[])
         from[strlen (from) - 1] = '\0';
     }
 
-  printf (" Input string: `%s'\n"
-          "From code set: `%s'\n"
-          "  To code set: `%s'\n",
+  printf (" Input string: \"%s\"\n"
+          "From code set: \"%s\"\n"
+          "  To code set: \"%s\"\n",
           in, from, to);
 
   out = iconv_string (in, from, to);
@@ -77,7 +77,7 @@ int main (int ac, char *av[])
     perror ("iconv");
   else
     {
-      printf ("\nOutput: `%s'\n", out);
+      printf ("\nOutput: \"%s\"\n", out);
       free (out);
     }
 
diff --git a/tests/test-parse-datetime.c b/tests/test-parse-datetime.c
index 22fe9bc..c483ed8 100644
--- a/tests/test-parse-datetime.c
+++ b/tests/test-parse-datetime.c
@@ -30,7 +30,7 @@
 
 #ifdef DEBUG
 #define LOG(str, now, res)                                              \
-  printf ("string `%s' diff %d %d\n",                   \
+  printf ("string \"%s\" diff %d %d\n",                                 \
           str, res.tv_sec - now.tv_sec, res.tv_nsec - now.tv_nsec);
 #else
 #define LOG(str, now, res) (void) 0
diff --git a/tests/test-xstrtoimax.sh b/tests/test-xstrtoimax.sh
index 3e3b06c..5829b9d 100755
--- a/tests/test-xstrtoimax.sh
+++ b/tests/test-xstrtoimax.sh
@@ -33,10 +33,10 @@ cat > exp <<EOF
 1->1 ()
 -1->-1 ()
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X argument \`9x'
+invalid suffix in X argument "${too_big}h"
+X argument "$too_big" too large
+invalid X argument "x"
+invalid suffix in X argument "9x"
 010->8 ()
 MiB->1048576 ()
 EOF
diff --git a/tests/test-xstrtol.sh b/tests/test-xstrtol.sh
index 1a2f7ca..aa02f2f 100755
--- a/tests/test-xstrtol.sh
+++ b/tests/test-xstrtol.sh
@@ -45,19 +45,19 @@ cat > expected <<EOF
 1->1 ()
 -1->-1 ()
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X argument \`9x'
+invalid suffix in X argument "${too_big}h"
+X argument "$too_big" too large
+invalid X argument "x"
+invalid suffix in X argument "9x"
 010->8 ()
 MiB->1048576 ()
 1->1 ()
-invalid X argument \`-1'
+invalid X argument "-1"
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X argument \`9x'
+invalid suffix in X argument "${too_big}h"
+X argument "$too_big" too large
+invalid X argument "x"
+invalid suffix in X argument "9x"
 010->8 ()
 MiB->1048576 ()
 EOF
diff --git a/tests/test-xstrtoll.sh b/tests/test-xstrtoll.sh
index 78a08c8..154b742 100755
--- a/tests/test-xstrtoll.sh
+++ b/tests/test-xstrtoll.sh
@@ -45,19 +45,19 @@ cat > expected <<EOF
 1->1 ()
 -1->-1 ()
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X argument \`9x'
+invalid suffix in X argument "${too_big}h"
+X argument "$too_big" too large
+invalid X argument "x"
+invalid suffix in X argument "9x"
 010->8 ()
 MiB->1048576 ()
 1->1 ()
-invalid X argument \`-1'
+invalid X argument "-1"
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X argument \`9x'
+invalid suffix in X argument "${too_big}h"
+X argument "$too_big" too large
+invalid X argument "x"
+invalid suffix in X argument "9x"
 010->8 ()
 MiB->1048576 ()
 EOF
diff --git a/tests/test-xstrtoumax.sh b/tests/test-xstrtoumax.sh
index 68abb93..5ec82be 100755
--- a/tests/test-xstrtoumax.sh
+++ b/tests/test-xstrtoumax.sh
@@ -31,12 +31,12 @@ mv k out
 # compare expected output
 cat > exp <<EOF
 1->1 ()
-invalid X argument \`-1'
+invalid X argument "-1"
 1k->1024 ()
-invalid suffix in X argument \`${too_big}h'
-X argument \`$too_big' too large
-invalid X argument \`x'
-invalid suffix in X argument \`9x'
+invalid suffix in X argument "${too_big}h"
+X argument "$too_big" too large
+invalid X argument "x"
+invalid suffix in X argument "9x"
 010->8 ()
 MiB->1048576 ()
 EOF
diff --git a/tests/unigbrk/test-uc-is-grapheme-break.c b/tests/unigbrk/test-uc-is-grapheme-break.c
index 4df5c3e..c70928d 100644
--- a/tests/unigbrk/test-uc-is-grapheme-break.c
+++ b/tests/unigbrk/test-uc-is-grapheme-break.c
@@ -109,7 +109,7 @@ main (int argc, char *argv[])
             }
           else
             {
-              fprintf (stderr, "%s:%d.%d: syntax error expecting `÷' or `÷'\n",
+              fprintf (stderr, "%s:%d.%d: syntax error expecting \"÷\" or \"÷\"\n",
                        filename, lineno, (int) (p - line + 1));
               exit (1);
             }
@@ -124,8 +124,8 @@ main (int argc, char *argv[])
 
               if (sscanf (p, "%x%n", &next_int, &n) != 1)
                 {
-                  fprintf (stderr, "%s:%d.%d: syntax error at `%s' expecting "
-                           "hexadecimal Unicode code point number\n",
+                  fprintf (stderr, "%s:%d.%d: syntax error at \"%s\" "
+                           "expecting hexadecimal Unicode code point number\n",
                            filename, lineno, (int) (p - line + 1), p);
                   exit (1);
                 }
diff --git a/top/GNUmakefile b/top/GNUmakefile
index 86bc60f..309d8c6 100644
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -114,7 +114,7 @@ endif
 
 abort-due-to-no-makefile:
 	@echo There seems to be no Makefile in this directory.   1>&2
-	@echo "You must run ./configure before running \`make'." 1>&2
+	@echo "You must run ./configure before running \"make\"." 1>&2
 	@exit 1
 
 endif