diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index be48e91be66a..acdb51d9a689 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -1,43 +1,40 @@
 # Created by: Alexander Nedotsukov <bland@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	nvidia-settings
 PORTVERSION=	340.24
 PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-settings/ \
 		ftp://download1.nvidia.com/XFree86/nvidia-settings/
 
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	Display Control Panel for X NVidia driver
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson \
 		libvdpau.so:${PORTSDIR}/multimedia/libvdpau
 
 USE_GNOME=	gtk20
 USES=		gmake pkgconfig tar:bzip2
 USE_GL=		gl
 USE_XORG=	xv xext
 
 PLIST_FILES=	bin/nvidia-settings \
 		man/man1/nvidia-settings.1.gz
 
+LDFLAGS+=	-Wl,--as-needed
 MAKE_ENV=	NV_USE_BUNDLED_LIBJANSSON=0 \
 		NV_VERBOSE= \
 		STRIP_CMD=${TRUE} \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_MAN="${INSTALL_MAN}" \
-		prefix=${PREFIX} \
+		INSTALL_BIN_ARGS="${INSTALL_PROGRAM:Ninstall}" \
+		INSTALL_DOC_ARGS="${INSTALL_MAN:Ninstall}" \
 		X_CFLAGS=-I${LOCALBASE}/include \
 		X_LDFLAGS=-L${LOCALBASE}/lib
 
-post-extract:	.SILENT
-	${RM} -f ${WRKSRC}/src/libXNVCtrl/libXNVCtrl.a
-
 post-patch:	.SILENT
-	${REINPLACE_CMD} -e '/^prefix/s/=/?&/' \
+	${REINPLACE_CMD} \
 		 -e '/^MANDIR/s|share/||' ${WRKSRC}/utils.mk
 
 .include <bsd.port.mk>
diff --git a/x11/nvidia-settings/files/patch-doc__Makefile b/x11/nvidia-settings/files/patch-doc__Makefile
deleted file mode 100644
index 780160afb1ea..000000000000
--- a/x11/nvidia-settings/files/patch-doc__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.orig	2014-08-10 20:37:40.000000000 -0700
-+++ doc/Makefile	2014-08-10 20:38:21.000000000 -0700
-@@ -74,7 +74,7 @@
- 
- MANPAGE_install: $(MANPAGE)
- 	$(MKDIR) $(MANDIR)
--	$(INSTALL) $(INSTALL_DOC_ARGS) $< $(MANDIR)/$(notdir $<)
-+	$(INSTALL_MAN) $< $(MANDIR)/$(notdir $<)
- 
- clean clobber:
- 	rm -rf $(MANPAGE) *~ $(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d \
diff --git a/x11/nvidia-settings/files/patch-utils.mk b/x11/nvidia-settings/files/patch-utils.mk
deleted file mode 100644
index 4c21302924fe..000000000000
--- a/x11/nvidia-settings/files/patch-utils.mk
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils.mk.orig	2014-08-09 21:23:23.872132403 -0700
-+++ utils.mk	2014-08-09 21:25:03.537126421 -0700
-@@ -34,6 +34,7 @@
- CFLAGS                += -fno-strict-aliasing -fno-omit-frame-pointer -Wformat=2
- CC_ONLY_CFLAGS        ?=
- LDFLAGS               ?=
-+LDFLAGS               += -Wl,--as-needed
- BIN_LDFLAGS           ?=
-
- HOST_CC               ?= $(CC)