diff --git a/doc/misc/options b/doc/misc/options
index 3fa81f4bae..cc69d66ec4 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -150,6 +150,14 @@ options {
 	fstrm-set-output-queue-size <integer>; // optional (only available if configured)
 	fstrm-set-reopen-interval <duration>; // optional (only available if configured)
 	geoip-directory ( <quoted_string> | none );
+	grease-dns-flags <boolean>;
+	grease-edns-flags <boolean>;
+	grease-edns-known-flags <integer>;
+	grease-edns-max-version <integer>;
+	grease-edns-negotiation <boolean>;
+	grease-nsid <boolean>;
+	grease-rate <percentage>;
+	grease-until <string>;
 	hostname ( <quoted_string> | none );
 	http-listener-clients <integer>; // optional (only available if configured)
 	http-port <integer>; // optional (only available if configured)
@@ -331,6 +339,9 @@ server <netprefix> {
 	edns <boolean>;
 	edns-udp-size <integer>;
 	edns-version <integer>;
+	grease-dns-flags <boolean>;
+	grease-edns-flags <boolean>;
+	grease-edns-negotiation <boolean>;
 	keys <server_key>;
 	max-udp-size <integer>;
 	notify-source ( <ipv4_address> | * );
@@ -442,6 +453,14 @@ view <string> [ <class> ] {
 	fetches-per-zone <integer> [ ( drop | fail ) ];
 	forward ( first | only );
 	forwarders [ port <integer> ] [ tls <string> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ tls <string> ]; ... };
+	grease-dns-flags <boolean>;
+	grease-edns-flags <boolean>;
+	grease-edns-known-flags <integer>;
+	grease-edns-max-version <integer>;
+	grease-edns-negotiation <boolean>;
+	grease-nsid <boolean>;
+	grease-rate <percentage>;
+	grease-until <string>;
 	ipv4only-contact <string>;
 	ipv4only-enable <boolean>;
 	ipv4only-server <string>;
@@ -549,6 +568,9 @@ view <string> [ <class> ] {
 		edns <boolean>;
 		edns-udp-size <integer>;
 		edns-version <integer>;
+		grease-dns-flags <boolean>;
+		grease-edns-flags <boolean>;
+		grease-edns-negotiation <boolean>;
 		keys <server_key>;
 		max-udp-size <integer>;
 		notify-source ( <ipv4_address> | * );
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 85d1c531c0..c3c8a693f9 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -2056,6 +2056,14 @@ static cfg_clausedef_t view_clauses[] = {
 	{ "filter-aaaa-on-v4", NULL, CFG_CLAUSEFLAG_ANCIENT },
 	{ "filter-aaaa-on-v6", NULL, CFG_CLAUSEFLAG_ANCIENT },
 	{ "glue-cache", NULL, CFG_CLAUSEFLAG_ANCIENT },
+	{ "grease-dns-flags", &cfg_type_boolean, 0 },
+	{ "grease-edns-flags", &cfg_type_boolean, 0 },
+	{ "grease-edns-known-flags", &cfg_type_uint32, 0 },
+	{ "grease-edns-max-version", &cfg_type_uint32, 0 },
+	{ "grease-edns-negotiation", &cfg_type_boolean, 0 },
+	{ "grease-nsid", &cfg_type_boolean, 0 },
+	{ "grease-rate", &cfg_type_percentage, 0 },
+	{ "grease-until", &cfg_type_astring, 0 },
 	{ "ipv4only-enable", &cfg_type_boolean, 0 },
 	{ "ipv4only-contact", &cfg_type_astring, 0 },
 	{ "ipv4only-server", &cfg_type_astring, 0 },
@@ -2591,6 +2599,9 @@ static cfg_clausedef_t server_clauses[] = {
 	{ "edns", &cfg_type_boolean, 0 },
 	{ "edns-udp-size", &cfg_type_uint32, 0 },
 	{ "edns-version", &cfg_type_uint32, 0 },
+	{ "grease-dns-flags", &cfg_type_boolean, 0 },
+	{ "grease-edns-flags", &cfg_type_boolean, 0 },
+	{ "grease-edns-negotiation", &cfg_type_boolean, 0 },
 	{ "keys", &cfg_type_server_key_kludge, 0 },
 	{ "max-udp-size", &cfg_type_uint32, 0 },
 	{ "notify-source", &cfg_type_sockaddr4wild, 0 },