diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile
index 8174f4e06bba..9f21da5267eb 100644
--- a/lib/libelf/Makefile
+++ b/lib/libelf/Makefile
@@ -1,203 +1,205 @@
 # $FreeBSD$
 
 SHLIBDIR?= /lib
 
 .include <bsd.own.mk>
 
 ELFTCDIR=${SRCTOP}/contrib/elftoolchain
 SRCDIR=	${ELFTCDIR}/libelf
 
 .PATH:	${SRCDIR}
 
 PACKAGE=	runtime
 LIB=	elf
 
 SRCS=	elf.c							\
 	elf_begin.c						\
 	elf_cntl.c						\
 	elf_end.c elf_errmsg.c elf_errno.c			\
 	elf_data.c						\
 	elf_fill.c						\
 	elf_flag.c						\
 	elf_getarhdr.c						\
 	elf_getarsym.c						\
 	elf_getbase.c						\
 	elf_getident.c						\
 	elf_hash.c						\
 	elf_kind.c						\
 	elf_memory.c						\
 	elf_next.c						\
 	elf_open.c						\
 	elf_rand.c						\
 	elf_rawfile.c						\
 	elf_phnum.c						\
 	elf_shnum.c						\
 	elf_shstrndx.c						\
 	elf_scn.c						\
 	elf_strptr.c						\
 	elf_update.c						\
 	elf_version.c						\
 	gelf_cap.c						\
 	gelf_chdr.c						\
 	gelf_checksum.c						\
 	gelf_dyn.c						\
 	gelf_ehdr.c						\
 	gelf_getclass.c						\
 	gelf_fsize.c						\
 	gelf_mips64el.c						\
 	gelf_move.c						\
 	gelf_phdr.c						\
 	gelf_rel.c						\
 	gelf_rela.c						\
 	gelf_shdr.c						\
 	gelf_sym.c						\
 	gelf_syminfo.c						\
 	gelf_symshndx.c						\
 	gelf_xlate.c						\
 	libelf_align.c						\
 	libelf_allocate.c					\
 	libelf_ar.c						\
 	libelf_ar_util.c					\
 	libelf_chdr.c						\
 	libelf_checksum.c					\
 	libelf_data.c						\
 	libelf_ehdr.c						\
 	libelf_elfmachine.c					\
 	libelf_extended.c					\
 	libelf_memory.c						\
 	libelf_open.c						\
 	libelf_phdr.c						\
 	libelf_shdr.c						\
 	libelf_xlate.c						\
 	${GENSRCS}
 
 INCS=		libelf.h gelf.h
 
 # This same hack is in lib/libdwarf/Makefile and usr.bin/readelf/Makefile
 # We need to link against the correct version of these files. One
 # solution is to include ../../sys in the include path. This causes
 # problems when a header file in sys depends on a file in another
 # part of the tree, e.g. a machine dependent header.
 #
 SRCS+=	sys/elf32.h sys/elf64.h sys/elf_common.h
 
 # Allow bootstrapping elftoolchain on Linux:
 .if defined(BOOTSTRAPPING) && ${.MAKE.OS} == "Linux"
 native-elf-format.h:
 	${ELFTCDIR}/common/native-elf-format > ${.TARGET} || rm ${.TARGET}
 SRCS+=	native-elf-format.h
 .endif
 
 GENSRCS=	libelf_fsize.c libelf_msize.c libelf_convert.c
 CLEANFILES=	${GENSRCS}
 CLEANDIRS=	sys
 CFLAGS+=	-I. -I${SRCDIR} -I${ELFTCDIR}/common
 
 sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA
 	mkdir -p ${.OBJDIR}/sys
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 SHLIB_MAJOR=	2
 
 MAN=	elf.3							\
 	elf_begin.3						\
 	elf_cntl.3						\
 	elf_end.3						\
 	elf_errmsg.3						\
 	elf_fill.3						\
 	elf_flagdata.3						\
 	elf_getarhdr.3						\
 	elf_getarsym.3						\
 	elf_getbase.3						\
 	elf_getdata.3						\
 	elf_getident.3						\
 	elf_getscn.3						\
 	elf_getphdrnum.3					\
 	elf_getphnum.3						\
 	elf_getshdrnum.3					\
 	elf_getshnum.3						\
 	elf_getshdrstrndx.3					\
 	elf_getshstrndx.3					\
 	elf_hash.3						\
 	elf_kind.3						\
 	elf_memory.3						\
 	elf_next.3						\
 	elf_open.3						\
 	elf_rawfile.3						\
 	elf_rand.3						\
 	elf_strptr.3						\
 	elf_update.3						\
 	elf_version.3						\
 	gelf.3							\
 	gelf_checksum.3						\
 	gelf_fsize.3						\
 	gelf_getcap.3						\
+	gelf_getchdr.3						\
 	gelf_getclass.3						\
 	gelf_getdyn.3						\
 	gelf_getehdr.3						\
 	gelf_getmove.3						\
 	gelf_getphdr.3						\
 	gelf_getrel.3						\
 	gelf_getrela.3						\
 	gelf_getshdr.3						\
 	gelf_getsym.3						\
 	gelf_getsyminfo.3					\
 	gelf_getsymshndx.3					\
 	gelf_newehdr.3						\
 	gelf_newphdr.3						\
 	gelf_update_ehdr.3					\
 	gelf_xlatetof.3
 
 MLINKS+= \
 	elf_errmsg.3 elf_errno.3		\
 	elf_flagdata.3 elf_flagarhdr.3		\
 	elf_flagdata.3 elf_flagehdr.3		\
 	elf_flagdata.3 elf_flagelf.3		\
 	elf_flagdata.3 elf_flagphdr.3		\
 	elf_flagdata.3 elf_flagscn.3		\
 	elf_flagdata.3 elf_flagshdr.3		\
 	elf_getdata.3 elf_newdata.3		\
 	elf_getdata.3 elf_rawdata.3		\
 	elf_getscn.3 elf_ndxscn.3		\
 	elf_getscn.3 elf_newscn.3		\
 	elf_getscn.3 elf_nextscn.3		\
 	elf_getshstrndx.3 elf_setshstrndx.3	\
 	elf_open.3 elf_openmemory.3             \
 	gelf_getcap.3 gelf_update_cap.3		\
 	gelf_getdyn.3 gelf_update_dyn.3		\
 	gelf_getmove.3 gelf_update_move.3	\
 	gelf_getrel.3 gelf_update_rel.3		\
 	gelf_getrela.3 gelf_update_rela.3	\
 	gelf_getsym.3 gelf_update_sym.3		\
 	gelf_getsyminfo.3 gelf_update_syminfo.3	\
 	gelf_getsymshndx.3 gelf_update_symshndx.3 \
 	gelf_update_ehdr.3 gelf_update_phdr.3	\
 	gelf_update_ehdr.3 gelf_update_shdr.3	\
 	gelf_xlatetof.3 gelf_xlatetom.3
 
 .for E in 32 64
 MLINKS+= \
 	gelf_checksum.3	elf${E}_checksum.3 	\
 	gelf_fsize.3	elf${E}_fsize.3 	\
+	gelf_getchdr.3	elf${E}_getchdr.3	\
 	gelf_getehdr.3	elf${E}_getehdr.3	\
 	gelf_getphdr.3	elf${E}_getphdr.3	\
 	gelf_getshdr.3	elf${E}_getshdr.3	\
 	gelf_newehdr.3	elf${E}_newehdr.3	\
 	gelf_newphdr.3	elf${E}_newphdr.3	\
 	gelf_xlatetof.3	elf${E}_xlatetof.3	\
 	gelf_xlatetof.3	elf${E}_xlatetom.3
 .endfor
 
 VERSION_MAP=           ${SRCDIR}/Version.map
 
 libelf_convert.c:	elf_types.m4 libelf_convert.m4
 libelf_fsize.c:		elf_types.m4 libelf_fsize.m4
 libelf_msize.c:		elf_types.m4 libelf_msize.m4
 
 .include <bsd.lib.mk>
 
 # Keep the .SUFFIXES line after the include of bsd.lib.mk
 .SUFFIXES:	.m4 .c
 .m4.c:
 	m4 -D SRCDIR=${SRCDIR} ${M4FLAGS} ${.IMPSRC} > ${.TARGET}