diff --git a/contrib/elftoolchain/elfdump/elfdump.c b/contrib/elftoolchain/elfdump/elfdump.c
index dfde9786c9f4..3c192cd21693 100644
--- a/contrib/elftoolchain/elfdump/elfdump.c
+++ b/contrib/elftoolchain/elfdump/elfdump.c
@@ -343,17 +343,20 @@ elf_phdr_type_str(unsigned int type)
 	static char s_type[32];
 
 	switch (type) {
-	case PT_NULL:		return "PT_NULL";
-	case PT_LOAD:		return "PT_LOAD";
-	case PT_DYNAMIC:	return "PT_DYNAMIC";
-	case PT_INTERP:		return "PT_INTERP";
-	case PT_NOTE:		return "PT_NOTE";
-	case PT_SHLIB:		return "PT_SHLIB";
-	case PT_PHDR:		return "PT_PHDR";
-	case PT_TLS:		return "PT_TLS";
-	case PT_GNU_EH_FRAME:	return "PT_GNU_EH_FRAME";
-	case PT_GNU_STACK:	return "PT_GNU_STACK";
-	case PT_GNU_RELRO:	return "PT_GNU_RELRO";
+	case PT_NULL:			return "PT_NULL";
+	case PT_LOAD:			return "PT_LOAD";
+	case PT_DYNAMIC:		return "PT_DYNAMIC";
+	case PT_INTERP:			return "PT_INTERP";
+	case PT_NOTE:			return "PT_NOTE";
+	case PT_SHLIB:			return "PT_SHLIB";
+	case PT_PHDR:			return "PT_PHDR";
+	case PT_TLS:			return "PT_TLS";
+	case PT_GNU_EH_FRAME:		return "PT_GNU_EH_FRAME";
+	case PT_GNU_STACK:		return "PT_GNU_STACK";
+	case PT_GNU_RELRO:		return "PT_GNU_RELRO";
+	case PT_OPENBSD_RANDOMIZE:	return "PT_OPENBSD_RANDOMIZE";
+	case PT_OPENBSD_WXNEEDED:	return "PT_OPENBSD_WXNEEDED";
+	case PT_OPENBSD_BOOTDATA:	return "PT_OPENBSD_BOOTDATA";
 	}
 	snprintf(s_type, sizeof(s_type), "<unknown: %#x>", type);
 	return (s_type);
diff --git a/contrib/elftoolchain/readelf/readelf.c b/contrib/elftoolchain/readelf/readelf.c
index 2c670bc7e7d5..f8d7fa2a5c5e 100644
--- a/contrib/elftoolchain/readelf/readelf.c
+++ b/contrib/elftoolchain/readelf/readelf.c
@@ -674,6 +674,9 @@ phdr_type(unsigned int mach, unsigned int ptype)
 	case PT_GNU_EH_FRAME: return "GNU_EH_FRAME";
 	case PT_GNU_STACK: return "GNU_STACK";
 	case PT_GNU_RELRO: return "GNU_RELRO";
+	case PT_OPENBSD_RANDOMIZE: return "OPENBSD_RANDOMIZE";
+	case PT_OPENBSD_WXNEEDED: return "OPENBSD_WXNEEDED";
+	case PT_OPENBSD_BOOTDATA: return "OPENBSD_BOOTDATA";
 	default:
 		if (ptype >= PT_LOOS && ptype <= PT_HIOS)
 			snprintf(s_ptype, sizeof(s_ptype), "LOOS+%#x",
diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h
index 86ae3f2e3998..6232756fa06e 100644
--- a/sys/sys/elf_common.h
+++ b/sys/sys/elf_common.h
@@ -535,6 +535,10 @@ typedef struct {
 #define	PT_ARM_EXIDX	0x70000001	/* ARM exception unwind tables. */
 #define	PT_HIPROC	0x7fffffff	/* Last processor-specific type. */
 
+#define	PT_OPENBSD_RANDOMIZE	0x65A3DBE6	/* OpenBSD random data segment */
+#define	PT_OPENBSD_WXNEEDED	0x65A3DBE7	/* OpenBSD EXEC/WRITE pages needed */
+#define	PT_OPENBSD_BOOTDATA	0x65A41BE6	/* OpenBSD section for boot args */
+
 /* Values for p_flags. */
 #define	PF_X		0x1		/* Executable. */
 #define	PF_W		0x2		/* Writable. */