diff --git a/Makefile.inc1 b/Makefile.inc1
index 173f70e526be..63d1b2f7a122 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1638,6 +1638,7 @@ _binutils=	gnu/usr.bin/binutils
 .endif
 .if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
 _elftctools=	lib/libelftc \
+		lib/libpe \
 		usr.bin/elfcopy \
 		usr.bin/nm \
 		usr.bin/size \
@@ -1650,6 +1651,7 @@ _elftctools+=	usr.bin/addr2line
 # If cross-building with an external binutils we still need to build strip for
 # the target (for at least crunchide).
 _elftctools=	lib/libelftc \
+		lib/libpe \
 		usr.bin/elfcopy
 .endif
 
diff --git a/lib/Makefile b/lib/Makefile
index ccc6507ff56e..699aa6ac7c02 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -80,6 +80,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libopie \
 	libpam \
 	libpcap \
+	${_libpe} \
 	libpjdlog \
 	${_libpmc} \
 	${_libproc} \
@@ -184,6 +185,7 @@ _cuse=		libcuse
 
 .if ${MK_TOOLCHAIN} != "no"
 _libelftc=	libelftc
+_libpe=		libpe
 .endif
 
 .if ${MK_FILE} != "no"
diff --git a/lib/libpe/Makefile b/lib/libpe/Makefile
new file mode 100644
index 000000000000..877b331d1013
--- /dev/null
+++ b/lib/libpe/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD$
+.include <bsd.own.mk>
+
+INTERNALLIB=
+
+ELFTCDIR=	${.CURDIR}/../../contrib/elftoolchain
+
+.PATH:	${ELFTCDIR}/libpe
+
+LIB=	pe
+
+SRCS=	libpe_buffer.c \
+	libpe_coff.c \
+	libpe_dos.c \
+	libpe_init.c \
+	libpe_rich.c \
+	libpe_section.c \
+	libpe_utils.c \
+	pe_buffer.c \
+	pe_cntl.c \
+	pe_coff.c \
+	pe_dos.c \
+	pe_flag.c \
+	pe_init.c \
+	pe_rich.c \
+	pe_section.c \
+	pe_symtab.c \
+	pe_update.c
+
+CFLAGS+=-I${ELFTCDIR}/libpe -I${ELFTCDIR}/common
+
+MAN=
+
+.include <bsd.lib.mk>
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index 28c23680d2fb..d27597f6641b 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -39,6 +39,7 @@ _INTERNALLIBS=	\
 		openbsd \
 		opts \
 		parse \
+		pe \
 		readline \
 		sl \
 		sm \
@@ -367,6 +368,9 @@ LDADD+=		${LDADD_${_l}}
 LIBELFTCDIR=	${OBJTOP}/lib/libelftc
 LIBELFTC?=	${LIBELFTCDIR}/libelftc.a
 
+LIBPEDIR=	${OBJTOP}/lib/libpe
+LIBPE?=		${LIBPEDIR}/libpe.a
+
 LIBREADLINEDIR=	${OBJTOP}/gnu/lib/libreadline/readline
 LIBREADLINE?=	${LIBREADLINEDIR}/libreadline.a