diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 5f37416d51c832d43ef7c6d4e600bb54fef5f59f..0289c4bc4f86dba89b08b1daa81ca5e3f4873d1b 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -929,7 +929,7 @@ BaseBackup(void)
 	}
 	if (PQntuples(res) != 1 || PQnfields(res) != 3)
 	{
-		fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),
+		fprintf(stderr, _("%s: could not identify system, got %d rows and %d fields\n"),
 				progname, PQntuples(res), PQnfields(res));
 		disconnect_and_exit(1);
 	}
@@ -1111,7 +1111,7 @@ BaseBackup(void)
 		}
 		if (r != bgchild)
 		{
-			fprintf(stderr, _("%s: child %i died, expected %i\n"),
+			fprintf(stderr, _("%s: child %d died, expected %d\n"),
 					progname, r, (int) bgchild);
 			disconnect_and_exit(1);
 		}
@@ -1123,7 +1123,7 @@ BaseBackup(void)
 		}
 		if (WEXITSTATUS(status) != 0)
 		{
-			fprintf(stderr, _("%s: child process exited with error %i\n"),
+			fprintf(stderr, _("%s: child process exited with error %d\n"),
 					progname, WEXITSTATUS(status));
 			disconnect_and_exit(1);
 		}
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
index fe9e39bb2143fbb4e1c7448ac5925b9eddb7b3ef..2134c8729cc17aeb67abdd2eb260a0e37a02df06 100644
--- a/src/bin/pg_basebackup/pg_receivexlog.c
+++ b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -237,7 +237,7 @@ StreamLog(void)
 	}
 	if (PQntuples(res) != 1 || PQnfields(res) != 3)
 	{
-		fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),
+		fprintf(stderr, _("%s: could not identify system, got %d rows and %d fields\n"),
 				progname, PQntuples(res), PQnfields(res));
 		disconnect_and_exit(1);
 	}
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
index 2e03c65fffffda6c3105c408391a8eed144d3514..b0cf836968dcf63745d3c8979dfb0c4f0d4be2cb 100644
--- a/src/bin/pg_basebackup/receivelog.c
+++ b/src/bin/pg_basebackup/receivelog.c
@@ -237,7 +237,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline, char *sysi
 		}
 		if (PQnfields(res) != 3 || PQntuples(res) != 1)
 		{
-			fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),
+			fprintf(stderr, _("%s: could not identify system, got %d rows and %d fields\n"),
 					progname, PQntuples(res), PQnfields(res));
 			PQclear(res);
 			return false;
@@ -391,7 +391,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline, char *sysi
 			 */
 			if (r != STREAMING_KEEPALIVE_SIZE)
 			{
-				fprintf(stderr, _("%s: keepalive message is incorrect size: %i\n"),
+				fprintf(stderr, _("%s: keepalive message is incorrect size: %d\n"),
 						progname, r);
 				return false;
 			}
@@ -405,7 +405,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline, char *sysi
 		}
 		if (r < STREAMING_HEADER_SIZE + 1)
 		{
-			fprintf(stderr, _("%s: streaming header too small: %i\n"),
+			fprintf(stderr, _("%s: streaming header too small: %d\n"),
 					progname, r);
 			return false;
 		}