diff -u nvidia-graphics-drivers-361-361.42/debian/changelog nvidia-graphics-drivers-361-361.42/debian/changelog
--- nvidia-graphics-drivers-361-361.42/debian/changelog
+++ nvidia-graphics-drivers-361-361.42/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers-361 (361.42-0ubuntu2.1) xenial; urgency=medium
+
+  * add bind mount unit for snappy (LP: #1588192)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 02 Jun 2016 14:29:10 +0200
+
 nvidia-graphics-drivers-361 (361.42-0ubuntu2) xenial; urgency=medium
 
   * debian/templates/control.in:
diff -u nvidia-graphics-drivers-361-361.42/debian/control nvidia-graphics-drivers-361-361.42/debian/control
--- nvidia-graphics-drivers-361-361.42/debian/control
+++ nvidia-graphics-drivers-361-361.42/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Build-Depends: debhelper (>= 8.0.0), sed (>> 3.0), libxext6, bzip2,
  xserver-xorg-dev (>= 2:1.4), execstack, libc6, libxvmc1,
- dh-modaliases, libxv1
+ dh-modaliases, libxv1, dh-systemd
 Standards-Version: 3.8.0
 Vcs-Git: git://github.com/tseliot/nvidia-graphics-drivers.git
 Vcs-Browser: http://github.com/tseliot/nvidia-graphics-drivers
diff -u nvidia-graphics-drivers-361-361.42/debian/nvidia-361.dirs nvidia-graphics-drivers-361-361.42/debian/nvidia-361.dirs
--- nvidia-graphics-drivers-361-361.42/debian/nvidia-361.dirs
+++ nvidia-graphics-drivers-361-361.42/debian/nvidia-361.dirs
@@ -22,4 +22,5 @@
 /usr/share/nvidia
 /lib/udev/rules.d
+/var/lib/snapd/lib/gl
 /usr/lib32/nvidia-361
 /usr/lib32/vdpau
diff -u nvidia-graphics-drivers-361-361.42/debian/nvidia-361.install nvidia-graphics-drivers-361-361.42/debian/nvidia-361.install
--- nvidia-graphics-drivers-361-361.42/debian/nvidia-361.install
+++ nvidia-graphics-drivers-361-361.42/debian/nvidia-361.install
@@ -4,6 +4,8 @@
 
 debian/glamor.conf                           /usr/share/nvidia-361
 
+debian/*.mount                               /lib/systemd/system
+
 debian/71-nvidia.rules                       lib/udev/rules.d
 debian/start-nvidia-persistenced             usr/bin
 debian/stop-nvidia-persistenced              usr/bin
diff -u nvidia-graphics-drivers-361-361.42/debian/nvidia-361.postinst nvidia-graphics-drivers-361-361.42/debian/nvidia-361.postinst
--- nvidia-graphics-drivers-361-361.42/debian/nvidia-361.postinst
+++ nvidia-graphics-drivers-361-361.42/debian/nvidia-361.postinst
@@ -110,6 +110,8 @@
     echo $NEWEST_KERNEL
 }
 
+#DEBHELPER#
+
 case "$1" in
     configure)
         # Deal with alternatives
@@ -278 +279,0 @@
-#DEBHELPER#
diff -u nvidia-graphics-drivers-361-361.42/debian/rules nvidia-graphics-drivers-361-361.42/debian/rules
--- nvidia-graphics-drivers-361-361.42/debian/rules
+++ nvidia-graphics-drivers-361-361.42/debian/rules
@@ -172,7 +172,13 @@
 endef
 
 %:
-	dh $@
+	dh $@ --with=systemd
+
+override_dh_systemd_enable:
+	dh_systemd_enable var-lib-snapd-lib-gl.mount
+
+override_dh_systemd_start:
+	dh_systemd_start var-lib-snapd-lib-gl.mount
 
 override_dh_shlibdeps:
 	dh_shlibdeps -Xtls -Xconf -X$(PKG_libdir32) -X$(libdir_multiarch_other) \
diff -u nvidia-graphics-drivers-361-361.42/debian/templates/control.in nvidia-graphics-drivers-361-361.42/debian/templates/control.in
--- nvidia-graphics-drivers-361-361.42/debian/templates/control.in
+++ nvidia-graphics-drivers-361-361.42/debian/templates/control.in
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Build-Depends: debhelper (>= 8.0.0), sed (>> 3.0), libxext6, bzip2,
  xserver-xorg-dev (>= 2:1.4), execstack, libc6, libxvmc1,
- dh-modaliases, libxv1
+ dh-modaliases, libxv1, dh-systemd
 Standards-Version: 3.8.0
 Vcs-Git: git://github.com/tseliot/nvidia-graphics-drivers.git
 Vcs-Browser: http://github.com/tseliot/nvidia-graphics-drivers
diff -u nvidia-graphics-drivers-361-361.42/debian/templates/nvidia-graphics-drivers.dirs.in nvidia-graphics-drivers-361-361.42/debian/templates/nvidia-graphics-drivers.dirs.in
--- nvidia-graphics-drivers-361-361.42/debian/templates/nvidia-graphics-drivers.dirs.in
+++ nvidia-graphics-drivers-361-361.42/debian/templates/nvidia-graphics-drivers.dirs.in
@@ -23,0 +24 @@
+/var/lib/snapd/lib/gl
diff -u nvidia-graphics-drivers-361-361.42/debian/templates/nvidia-graphics-drivers.install.in nvidia-graphics-drivers-361-361.42/debian/templates/nvidia-graphics-drivers.install.in
--- nvidia-graphics-drivers-361-361.42/debian/templates/nvidia-graphics-drivers.install.in
+++ nvidia-graphics-drivers-361-361.42/debian/templates/nvidia-graphics-drivers.install.in
@@ -4,6 +4,8 @@
 
 debian/glamor.conf                           #PKGDATADIR#
 
+debian/*.mount                               /lib/systemd/system
+
 debian/71-nvidia.rules                       lib/udev/rules.d
 debian/start-nvidia-persistenced             usr/bin
 debian/stop-nvidia-persistenced              usr/bin
diff -u nvidia-graphics-drivers-361-361.42/debian/templates/nvidia-graphics-drivers.postinst.in nvidia-graphics-drivers-361-361.42/debian/templates/nvidia-graphics-drivers.postinst.in
--- nvidia-graphics-drivers-361-361.42/debian/templates/nvidia-graphics-drivers.postinst.in
+++ nvidia-graphics-drivers-361-361.42/debian/templates/nvidia-graphics-drivers.postinst.in
@@ -110,6 +110,8 @@
     echo $NEWEST_KERNEL
 }
 
+#DEBHELPER#
+
 case "$1" in
     configure)
         # Deal with alternatives
@@ -278 +279,0 @@
-#DEBHELPER#
only in patch2:
unchanged:
--- nvidia-graphics-drivers-361-361.42.orig/debian/var-lib-snapd-lib-gl.mount
+++ nvidia-graphics-drivers-361-361.42/debian/var-lib-snapd-lib-gl.mount
@@ -0,0 +1,11 @@
+[Unit]
+Description=Mount unit for nvidia support in snappy
+
+[Mount]
+What=/usr/lib/nvidia-361
+Where=/var/lib/snapd/lib/gl
+Options=bind
+Type=none
+
+[Install]
+WantedBy=multi-user.target