Index: head/UPDATING
===================================================================
--- head/UPDATING
+++ head/UPDATING
@@ -6,6 +6,23 @@
 you update your ports collection, before attempting any port upgrades.
 
 20160829:
+  AFFECTS: users of x11/nvidia-driver
+  AUTHOR: cem@FreeBSD.org
+
+  The Nvidia driver has been updated to 367.35.  In this version of the driver,
+  some important functionality has been broken out into a separate
+  nvidia-modeset.ko.
+
+  Users that experience a hang starting X or observe
+
+    [    43.243] (II) NVIDIA(0): Validated MetaModes:
+    [    43.243] (II) NVIDIA(0):     "NULL"
+
+  in their Xorg.logs should replace 'nvidia.ko' with 'nvidia-modeset.ko' in
+  their loader.conf or rc.conf configurations.  (nvidia-modeset.ko has a
+  MODULE_DEPENDS relationship to nvidia.ko and will bring it in automatically.)
+
+20160829:
   AFFECTS: users of security/sshguard
   AUTHOR: feld@FreeBSD.org
 
Index: head/x11/nvidia-driver/Makefile
===================================================================
--- head/x11/nvidia-driver/Makefile
+++ head/x11/nvidia-driver/Makefile
@@ -12,7 +12,7 @@
 PORTNAME=	nvidia-driver
 DISTVERSION?=	367.35
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
Index: head/x11/nvidia-driver/pkg-message
===================================================================
--- head/x11/nvidia-driver/pkg-message
+++ head/x11/nvidia-driver/pkg-message
@@ -0,0 +1,12 @@
+The Nvidia driver has been updated to 367.35.  In this version of the driver,
+some important functionality has been broken out into a separate
+nvidia-modeset.ko.
+
+Users that experience a hang starting X or observe
+
+  [    43.243] (II) NVIDIA(0): Validated MetaModes:
+  [    43.243] (II) NVIDIA(0):     "NULL"
+
+in their Xorg.logs should replace 'nvidia.ko' with 'nvidia-modeset.ko' in their
+loader.conf or rc.conf configurations.  (nvidia-modeset.ko has a MODULE_DEPENDS
+relationship to nvidia.ko and will bring it in automatically.)
Index: head/x11/nvidia-driver/pkg-plist
===================================================================
--- head/x11/nvidia-driver/pkg-plist
+++ head/x11/nvidia-driver/pkg-plist
@@ -36,10 +36,10 @@
 %%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.%%SHLIB_VERSION%%
 %%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.1
 %%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.%%SHLIB_VERSION%%
+%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.0
+%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so
 %%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.%%SHLIB_VERSION%%
 %%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.1
-%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so
-%%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.0
 %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.%%SHLIB_VERSION%%
 %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1
 %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so