diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 79d0e5cb9d..239269df08 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -1738,6 +1738,8 @@ BaseBackup(void)
 			exit(1);
 		}
 
+		AppendPlainCommandOption(&buf, use_new_option_syntax, "TABLESPACE_MAP");
+
 		if ((colon = strchr(backup_target, ':')) == NULL)
 		{
 			AppendStringCommandOption(&buf, use_new_option_syntax,
