*** a/src/bin/pg_basebackup/pg_basebackup.c
--- b/src/bin/pg_basebackup/pg_basebackup.c
***************
*** 1084,1090 **** ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
  	if (copybuf != NULL)
  		PQfreemem(copybuf);
  
! 	if (basetablespace)
  		WriteRecoveryConf();
  }
  
--- 1084,1090 ----
  	if (copybuf != NULL)
  		PQfreemem(copybuf);
  
! 	if (basetablespace && writerecoveryconf)
  		WriteRecoveryConf();
  }
  
