Index: head/x11/nvidia-xconfig/Makefile
===================================================================
--- head/x11/nvidia-xconfig/Makefile	(revision 397954)
+++ head/x11/nvidia-xconfig/Makefile	(revision 397955)
@@ -1,30 +1,32 @@
 # Created by: Alexander Nedotsukov <bland@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	nvidia-xconfig
-PORTVERSION=	310.14
+PORTVERSION=	355.11
 CATEGORIES=	x11
-MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-xconfig/ \
-		ftp://download1.nvidia.com/XFree86/nvidia-xconfig/
 
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	Tool to manipulate X configuration files for the NVidia driver
 
 LICENSE=	GPLv2
 
-USES=		gmake tar:bzip2
+USE_GITHUB=	yes
+GH_ACCOUNT=	NVIDIA
+GH_TAGNAME=	${PORTVERSION}
+
+USES=		gmake
 
 MAKE_ENV=	NV_VERBOSE= \
 		STRIP_CMD=${TRUE} \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_MAN="${INSTALL_MAN}" \
 		prefix=${PREFIX}
 
 PLIST_FILES=	bin/nvidia-xconfig \
 		man/man1/nvidia-xconfig.1.gz
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/^prefix/s/=/?&/' \
 		 -e '/^MANDIR/s|share/||' ${WRKSRC}/utils.mk
 
 .include <bsd.port.mk>
Index: head/x11/nvidia-xconfig/distinfo
===================================================================
--- head/x11/nvidia-xconfig/distinfo	(revision 397954)
+++ head/x11/nvidia-xconfig/distinfo	(revision 397955)
@@ -1,2 +1,2 @@
-SHA256 (nvidia-xconfig-310.14.tar.bz2) = 34524033eac86a422bbf813a309f218368dd9f95265cf730ef425b1edd1fe364
-SIZE (nvidia-xconfig-310.14.tar.bz2) = 101116
+SHA256 (NVIDIA-nvidia-xconfig-355.11_GH0.tar.gz) = 8a38b99e0d4c545e8259e85ec256a978f773ba1df8890b3c42f615e68bd39788
+SIZE (NVIDIA-nvidia-xconfig-355.11_GH0.tar.gz) = 139143
Index: head/x11/nvidia-xconfig/files/patch-Makefile
===================================================================
--- head/x11/nvidia-xconfig/files/patch-Makefile	(revision 397954)
+++ head/x11/nvidia-xconfig/files/patch-Makefile	(revision 397955)
@@ -1,16 +1,16 @@
---- Makefile.orig	2012-09-19 10:51:22.000000000 +0900
-+++ Makefile	2012-10-13 20:24:14.000000000 +0900
-@@ -112,11 +112,11 @@
+--- Makefile.orig	2015-08-31 19:26:16 UTC
++++ Makefile
+@@ -112,11 +112,11 @@ install: NVIDIA_XCONFIG_install MANPAGE_
  
  NVIDIA_XCONFIG_install: $(NVIDIA_XCONFIG)
  	$(MKDIR) $(BINDIR)
 -	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
 +	$(INSTALL_PROGRAM) $< $(BINDIR)/$(notdir $<)
  
  MANPAGE_install: $(MANPAGE)
  	$(MKDIR) $(MANDIR)
 -	$(INSTALL) $(INSTALL_DOC_ARGS) $< $(MANDIR)/$(notdir $<)
 +	$(INSTALL_MAN) $< $(MANDIR)/$(notdir $<)
  
  $(NVIDIA_XCONFIG): $(OBJS)
  	$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \