diff --git a/ChangeLog b/ChangeLog
index 98d026c56..8ad7bcd9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2013-12-23  Colin Watson  <cjwatson@debian.org>
+
+	Update some documentation to refer to Git rather than Bazaar.
+
+	* docs/grub.texi (Obtaining and Building GRUB): Refer to Git rather
+	than Bazaar.
+	* po/README: Likewise.  Fix spelling mistake.
+
+2013-12-23  Colin Watson  <cjwatson@ubuntu.com>
+
+	Don't distribute config.h.
+
+	* Makefile.am (platform_HEADERS): Move to ...
+	(nodist_platform_HEADERS): ... here.  Fixes gettext_strings_test
+	failure when building from a distributed tarball.
+
+2013-12-23  Colin Watson  <cjwatson@ubuntu.com>
+
+	* configure.ac: Fix spelling.
+	* grub-core/commands/parttool.c: Fix grammar.
+	* grub-core/disk/ldm.c: Use consistent capitalisation for "LDM
+	Embedding Partition".
+
 2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	ARM64 support for grub-mkrescue.
diff --git a/Makefile.am b/Makefile.am
index b11306679..320e86f8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,7 +127,7 @@ widthspec.h: $(FONT_SOURCE) build-grub-gen-widthspec
 CLEANFILES += widthspec.h
 
 # Install config.h into platformdir
-platform_HEADERS = config.h
+nodist_platform_HEADERS = config.h
 
 pkgdata_DATA += grub-mkconfig_lib
 
diff --git a/configure.ac b/configure.ac
index 2cc8a6cae..77c942a29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1168,7 +1168,7 @@ enable_grub_emu_usb=no
 fi
 
 if test x"$enable_grub_emu_sdl" = xno ; then
-  grub_emu_sdl_excuse="explicitely disabled"
+  grub_emu_sdl_excuse="explicitly disabled"
 fi
 [if [ x"$grub_emu_sdl_excuse" = x ]; then
     # Check for libSDL libraries.]
@@ -1184,7 +1184,7 @@ AC_CHECK_LIB([SDL], [SDL_Init], [LIBSDL="-lSDL"],
 [fi]
 
 if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then
-  AC_MSG_ERROR([SDL support for grub-emu was explicitely requested but can't be compiled ($grub_emu_sdl_excuse)])
+  AC_MSG_ERROR([SDL support for grub-emu was explicitly requested but can't be compiled ($grub_emu_sdl_excuse)])
 fi
 if test x"$grub_emu_sdl_excuse" = x ; then
 enable_grub_emu_sdl=yes
diff --git a/docs/grub.texi b/docs/grub.texi
index 91fa1de5d..46b9e7f8e 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -6385,7 +6385,7 @@ just do:
 @end group
 @end example
 
-Also, the latest version is available using Bazaar. See
+Also, the latest version is available using Git. See
 @uref{http://www.gnu.org/software/grub/grub-download.html} for more
 information.
 
diff --git a/grub-core/commands/parttool.c b/grub-core/commands/parttool.c
index f144c511b..a47ff0776 100644
--- a/grub-core/commands/parttool.c
+++ b/grub-core/commands/parttool.c
@@ -133,7 +133,7 @@ show_help (grub_device_t dev)
 	  }
       }
   if (! found)
-    grub_printf_ (N_("Sorry no parttool is available for %s\n"),
+    grub_printf_ (N_("Sorry, no parttool is available for %s\n"),
 		  dev->disk->partition->partmap->name);
   return GRUB_ERR_NONE;
 }
diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
index d64d0a89d..8075f2a9e 100644
--- a/grub-core/disk/ldm.c
+++ b/grub-core/disk/ldm.c
@@ -1012,7 +1012,7 @@ grub_util_ldm_embed (struct grub_disk *disk, unsigned int *nsectors,
 			      usable for bootloaders (called generically
 			      "embedding zone") and this operation is
 			      called "embedding".  */
-			   N_("your LDM embedding Partition is too small;"
+			   N_("your LDM Embedding Partition is too small;"
 			      " embedding won't be possible"));
       *nsectors = lv->size;
       if (*nsectors > max_nsectors)
diff --git a/po/README b/po/README
index c9be27b52..aaf829267 100644
--- a/po/README
+++ b/po/README
@@ -1,6 +1,6 @@
 
-If you checked out this source tree directly from GRUB Bazaar, you might
-be wondering where are the POT and PO files.  Here are some instructions
+If you checked out this source tree directly from GRUB Git, you might be
+wondering where are the POT and PO files.  Here are some instructions
 that will hopefully clarify the situation.
 
   - If you're a user or a distributor, simply fill the po directory by
@@ -16,7 +16,7 @@ that will hopefully clarify the situation.
     (http://translationproject.org/).  The GRUB project doesn't interact
     with translators directly (but we dearly appreciate your work!).
 
-  - If you're a developer adding/removing/modifiing translatable strings,
+  - If you're a developer adding/removing/modifying translatable strings,
     you can check that these turn into a sane POT file by using the
     `po/grub.pot' make rule.