diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
new file mode 100644
index acd2514..2397932
*** a/src/bin/initdb/initdb.c
--- b/src/bin/initdb/initdb.c
*************** make_template0(void)
*** 1976,1981 ****
--- 1976,1983 ----
  		"REVOKE CREATE,TEMPORARY ON DATABASE template1 FROM public;\n",
  		"REVOKE CREATE,TEMPORARY ON DATABASE template0 FROM public;\n",
  
+ 		"COMMENT ON DATABASE template0 IS 'unmodifiable empty database';\n",
+ 
  		/*
  		 * Finally vacuum to clean up dead rows in pg_database
  		 */
*************** make_postgres(void)
*** 2011,2016 ****
--- 2013,2019 ----
  	const char **line;
  	static const char *postgres_setup[] = {
  		"CREATE DATABASE postgres;\n",
+ 		"COMMENT ON DATABASE postgres IS 'default administrative database';\n",
  		NULL
  	};
  
