diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile
index 992a98242528..0d7643336aa7 100644
--- a/devel/libelf/Makefile
+++ b/devel/libelf/Makefile
@@ -1,53 +1,41 @@
 # Created by: roam@FreeBSD.org
 
 PORTNAME=	libelf
-PORTVERSION=	0.8.13
+DISTVERSION=	0.8.13
 PORTREVISION=	3
 CATEGORIES=	devel
-MASTER_SITES=	http://www.mr511.de/software/ \
-		SUNSITE/libs
+MASTER_SITES=	NETBSD
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Public ELF file access library similar to libelf(3) in Solaris
 
 LICENSE=	LGPL20
 
+USES=		desthack pathfix
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=		--enable-shared --disable-compat
+
 CONFLICTS_INSTALL=	elfutils
 
-OPTIONS_DEFINE=	EXTENDED NLS SANITY
+OPTIONS_DEFINE=		EXTENDED NLS SANITY
 OPTIONS_DEFAULT=	EXTENDED SANITY
 
-EXTENDED_DESC=	ELF format extensions
-SANITY_DESC=	Avoid loading invalid ELF files
+EXTENDED_DESC=		ELF format extensions
+SANITY_DESC=		Avoid loading invalid ELF files
 
-.include <bsd.port.options.mk>
+EXTENDED_CONFIGURE_ENABLE=	extended-format
+NLS_USES=			gettext localbase:ldflags
+NLS_CONFIGURE_ENABLE=		nls
+NLS_LDFLAGS=			-lintl
+SANITY_CONFIGURE_ENABLE=	sanity-checks
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-shared --disable-compat
-USE_LDCONFIG=	yes
-USES=		desthack pathfix
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-CONFIGURE_ARGS+=	--enable-nls
-USES+=		gettext
 PLIST_SUB+=	GETTEXT=""
 .else
-CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	GETTEXT="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MEXTENDED}
-CONFIGURE_ARGS+=	--enable-extended-format
-.else
-CONFIGURE_ARGS+=	--disable-extended-format
-.endif
-
-.if ${PORT_OPTIONS:MSANITY}
-CONFIGURE_ARGS+=	--enable-sanity-checks
-.else
-CONFIGURE_ARGS+=	--disable-sanity-checks
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/libelf/pkg-descr b/devel/libelf/pkg-descr
index c39657adf3fe..2bebb4a4489c 100644
--- a/devel/libelf/pkg-descr
+++ b/devel/libelf/pkg-descr
@@ -1,8 +1,8 @@
 From the libelf README file:
 
   This is the public release of libelf, a free ELF object
   file access library. If you have problems with applications
   that use libelf and work with the commercial (SVR4, Solaris)
   version but not with this one, please contact me.
 
-WWW: http://www.mr511.de/software/
+WWW: https://web.archive.org/web/20181111033959/www.mr511.de/software/english.html