diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c
index 53e0700..10c0531 100644
--- a/contrib/pg_upgrade/relfilenode.c
+++ b/contrib/pg_upgrade/relfilenode.c
@@ -247,7 +247,7 @@ transfer_relfile(pageCnvCtx *pageConverter, FileNameMap *map,
 				if (errno == ENOENT)
 					return;
 				else
-					pg_log(PG_FATAL, "error while checking for file existance \"%s.%s\" (\"%s\" to \"%s\"): %s\n",
+					pg_log(PG_FATAL, "error while checking for file existence \"%s.%s\" (\"%s\" to \"%s\"): %s\n",
 						   map->nspname, map->relname, old_file, new_file,
 						   getErrorText(errno));
 			}
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index fc6ff80..6c971f3 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -903,7 +903,7 @@ ValidXLogPageHeader(XLogReaderState *state, XLogRecPtr recptr,
 /*
  * Find the first record with at an lsn >= RecPtr.
  *
- * Useful for checking wether RecPtr is a valid xlog address for reading and to
+ * Useful for checking whether RecPtr is a valid xlog address for reading and to
  * find the first valid address after some address when dumping records for
  * debugging purposes.
  */
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
index eb90f1b..1d59396 100644
--- a/src/backend/utils/adt/tsrank.c
+++ b/src/backend/utils/adt/tsrank.c
@@ -530,11 +530,11 @@ typedef struct
 	int			q;
 	DocRepresentation *begin;
 	DocRepresentation *end;
-} Extention;
+} Extension;
 
 
 static bool
-Cover(DocRepresentation *doc, int len, QueryRepresentation *qr, Extention *ext)
+Cover(DocRepresentation *doc, int len, QueryRepresentation *qr, Extension *ext)
 {
 	DocRepresentation *ptr;
 	int			lastpos = ext->pos;
@@ -729,7 +729,7 @@ calc_rank_cd(float4 *arrdata, TSVector txt, TSQuery query, int method)
 	int			len,
 				i,
 				doclen = 0;
-	Extention	ext;
+	Extension	ext;
 	double		Wdoc = 0.0;
 	double		invws[lengthof(weights)];
 	double		SumDist = 0.0,
@@ -759,7 +759,7 @@ calc_rank_cd(float4 *arrdata, TSVector txt, TSQuery query, int method)
 		return 0.0;
 	}
 
-	MemSet(&ext, 0, sizeof(Extention));
+	MemSet(&ext, 0, sizeof(Extension));
 	while (Cover(doc, doclen, &qr, &ext))
 	{
 		double		Cpos = 0.0;
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index b68a649..94b0117 100644
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -487,7 +487,7 @@ ExtensionBehavior
 ExtensionControlFile
 ExtensionInfo
 ExtensionVersionInfo
-Extention
+Extension
 FDWCollateState
 FD_SET
 FILE