diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 5dcb3a60ab..24d15304f5 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -40,7 +40,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.74 2010/02/26 02:00:39 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.75 2010/07/02 02:44:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -552,8 +552,9 @@ create_tablespace_directories(const char *location, const Oid tablespaceoid)
 		if (errno == ENOENT)
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_FILE),
-					 errmsg("directory \"%s\" does not exist",
-							location)));
+					 errmsg("directory \"%s\" does not exist", location),
+					 InRecovery ? errhint("Create directory \"%s\" for this tablespace before "
+							 "restarting the server.", location) : 0));
 		else
 			ereport(ERROR,
 					(errcode_for_file_access(),