diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 10921a64357..a706d8c7c00 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.117.2.2 2003/02/19 14:14:58 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.117.2.3 2005/05/05 19:54:01 tgl Exp $
  *
  *
  *-------------------------------------------------------------------------
@@ -117,9 +117,11 @@ ReverifyMyDatabase(const char *name)
 
 	/*
 	 * Also check that the database is currently allowing connections.
+	 * (We do not enforce this in standalone mode, however, so that there is
+	 * a way to recover from "UPDATE pg_database SET datallowconn = false;")
 	 */
 	dbform = (Form_pg_database) GETSTRUCT(tup);
-	if (!dbform->datallowconn)
+	if (IsUnderPostmaster && !dbform->datallowconn)
 		elog(FATAL, "Database \"%s\" is not currently accepting connections",
 			 name);