diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 80e5aa1816f272d526543c9c6267e5353cc6f401..a1d303b75aca9b46512800f22a465dda974238d8 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -2033,7 +2033,8 @@ static struct config_int ConfigureNamesInt[] =
 		{"commit_delay", PGC_USERSET, WAL_SETTINGS,
 			gettext_noop("Sets the delay in microseconds between transaction commit and "
 						 "flushing WAL to disk."),
-			NULL
+			NULL,
+			GUC_UNIT_MS
 		},
 		&CommitDelay,
 		0, 0, 100000,
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index c24afb043436e46fe0d959ec048aa8b0c7784f0e..adcbcf6620578440105ec7fb6c30909a649afd11 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -137,7 +137,7 @@
 
 # - Cost-Based Vacuum Delay -
 
-#vacuum_cost_delay = 0ms		# 0-100 milliseconds
+#vacuum_cost_delay = 0			# 0-100 milliseconds
 #vacuum_cost_page_hit = 1		# 0-10000 credits
 #vacuum_cost_page_miss = 10		# 0-10000 credits
 #vacuum_cost_page_dirty = 20		# 0-10000 credits