diff --git a/CHANGES b/CHANGES
index df28b2ccad..847922bcf7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4330.	[protocol]	Identify the PAD option as "PAD" when printing out
+			a message.
+
 	--- 9.10.4b1 released ---
 
 4329.	[func]		Warn about a common misconfiguration when forwarding
diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index b49bc7b0b7..9676293cc1 100644
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -102,10 +102,11 @@
 #define DNS_MESSAGEEXTFLAG_DO		0x8000U
 
 /*%< EDNS0 extended OPT codes */
-#define DNS_OPT_NSID		0x0003		/*%< NSID opt code */
-#define DNS_OPT_CLIENT_SUBNET	0x0008		/*%< client subnet opt code */
-#define DNS_OPT_EXPIRE		0x0009		/*%< EXPIRE opt code */
-#define DNS_OPT_COOKIE		0x000a		/*%< COOKIE opt code */
+#define DNS_OPT_NSID		3		/*%< NSID opt code */
+#define DNS_OPT_CLIENT_SUBNET	8		/*%< client subnet opt code */
+#define DNS_OPT_EXPIRE		9		/*%< EXPIRE opt code */
+#define DNS_OPT_COOKIE		10		/*%< COOKIE opt code */
+#define DNS_OPT_PAD		12		/*%< PAD opt code */
 
 /*%< The number of EDNS options we know about. */
 #define DNS_EDNSOPTIONS	4
diff --git a/lib/dns/message.c b/lib/dns/message.c
index 8b044b71d9..d591984a39 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -3373,6 +3373,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg,
 					continue;
 				}
 				ADD_STRING(target, "; EXPIRE");
+			} else if (optcode == DNS_OPT_PAD) {
+				ADD_STRING(target, "; PAD");
 			} else {
 				ADD_STRING(target, "; OPT=");
 				snprintf(buf, sizeof(buf), "%u", optcode);