diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 6e7e106174c9..c78b7cf70df0 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -13,6 +13,8 @@ LICENSE_NAME=	VIM License
 LICENSE_FILE=	${WRKSRC}/runtime/doc/uganda.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo
+
 USES=		cpe iconv ncurses pkgconfig shebangfix
 USE_GITHUB=	yes
 
@@ -25,6 +27,8 @@ MAKE_ARGS=	STRIP="${STRIP_CMD}" \
 		VIMRCLOC=${ETCDIR} \
 		VIMRUNTIMEDIR=${PREFIX}/share/vim/${VIM_VER}
 
+CONFIGURE_ENV+=	LIBS=-lsysinfo
+LDFLAGS+=	-L${LOCALBASE}/lib
 CPE_VERSION=	${PORTVERSION:R}
 GNU_CONFIGURE=	yes
 PLIST_SUB=	VIM_VER=${VIM_VER}
@@ -170,10 +174,6 @@ post-patch:
 	${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|g; s|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/src/auto/configure
 
-post-configure:
-# Needed when devel/libsysinfo is installed:
-	${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/ d' ${WRKSRC}/src/auto/config.h
-
 post-install-DEFAULT_VIMRC-on:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/vimrc.sample