diff -Nru nvidia-graphics-drivers-390-390.87/debian/changelog nvidia-graphics-drivers-390-390.87/debian/changelog
--- nvidia-graphics-drivers-390-390.87/debian/changelog	2018-11-16 11:23:42.000000000 +0000
+++ nvidia-graphics-drivers-390-390.87/debian/changelog	2018-12-06 11:14:30.000000000 +0000
@@ -1,3 +1,16 @@
+nvidia-graphics-drivers-390 (390.87-0ubuntu4) disco; urgency=medium
+
+  * debian/rules:
+    - Prevent pkgbinarymangler from symlinking docs (LP: #1804738).
+  * debian/templates/control.in:
+    - Drop the build dependencies on the wayland libraries.
+  * debian/templates/libnvidia-gl-flavour.install.in:
+    - Drop 10_nvidia_wayland.json and libnvidia-egl-wayland.so.
+      The new egl-wayland packages will provide the library and the
+      headers.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 06 Dec 2018 12:14:30 +0100
+
 nvidia-graphics-drivers-390 (390.87-0ubuntu3) disco; urgency=medium
 
   * debian/dkms_nvidia/patches/buildfix_kernel_4.18.patch:
diff -Nru nvidia-graphics-drivers-390-390.87/debian/control nvidia-graphics-drivers-390-390.87/debian/control
--- nvidia-graphics-drivers-390-390.87/debian/control	2018-11-16 11:23:42.000000000 +0000
+++ nvidia-graphics-drivers-390-390.87/debian/control	2018-12-06 11:14:30.000000000 +0000
@@ -11,8 +11,6 @@
  dpkg-dev (>= 1.17),
  xz-utils,
  dkms,
- libwayland-client0,
- libwayland-server0,
  libxext6 [!ppc64el],
  quilt,
  po-debconf,
diff -Nru nvidia-graphics-drivers-390-390.87/debian/libnvidia-gl-390.install nvidia-graphics-drivers-390-390.87/debian/libnvidia-gl-390.install
--- nvidia-graphics-drivers-390-390.87/debian/libnvidia-gl-390.install	2018-11-16 11:23:42.000000000 +0000
+++ nvidia-graphics-drivers-390-390.87/debian/libnvidia-gl-390.install	2018-12-06 11:14:30.000000000 +0000
@@ -10,5 +10,3 @@
 NVIDIA-Linux/libEGL_nvidia.so.390.87                              usr/lib/x86_64-linux-gnu
 NVIDIA-Linux/libGLESv2_nvidia.so.390.87                           usr/lib/x86_64-linux-gnu
 NVIDIA-Linux/libGLESv1_CM_nvidia.so.390.87                        usr/lib/x86_64-linux-gnu
-NVIDIA-Linux/libnvidia-egl-wayland.so.1.0.2                          usr/lib/x86_64-linux-gnu
-NVIDIA-Linux/10_nvidia_wayland.json                                  usr/share/egl/egl_external_platform.d
diff -Nru nvidia-graphics-drivers-390-390.87/debian/rules nvidia-graphics-drivers-390-390.87/debian/rules
--- nvidia-graphics-drivers-390-390.87/debian/rules	2018-11-16 10:11:56.000000000 +0000
+++ nvidia-graphics-drivers-390-390.87/debian/rules	2018-12-06 11:13:17.000000000 +0000
@@ -2,6 +2,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export NO_DOC_PKG_MANGLE=1
 
 include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/pkg-info.mk
diff -Nru nvidia-graphics-drivers-390-390.87/debian/templates/control.in nvidia-graphics-drivers-390-390.87/debian/templates/control.in
--- nvidia-graphics-drivers-390-390.87/debian/templates/control.in	2018-11-16 10:11:56.000000000 +0000
+++ nvidia-graphics-drivers-390-390.87/debian/templates/control.in	2018-12-06 11:13:20.000000000 +0000
@@ -11,8 +11,6 @@
  dpkg-dev (>= 1.17),
  xz-utils,
  dkms,
- libwayland-client0,
- libwayland-server0,
  libxext6 [!ppc64el],
  quilt,
  po-debconf,
diff -Nru nvidia-graphics-drivers-390-390.87/debian/templates/libnvidia-gl-flavour.install.in nvidia-graphics-drivers-390-390.87/debian/templates/libnvidia-gl-flavour.install.in
--- nvidia-graphics-drivers-390-390.87/debian/templates/libnvidia-gl-flavour.install.in	2018-11-16 10:11:56.000000000 +0000
+++ nvidia-graphics-drivers-390-390.87/debian/templates/libnvidia-gl-flavour.install.in	2018-12-06 11:13:19.000000000 +0000
@@ -10,5 +10,3 @@
 NVIDIA-Linux/libEGL_nvidia.so.#VERSION#                              #LIBDIR#
 NVIDIA-Linux/libGLESv2_nvidia.so.#VERSION#                           #LIBDIR#
 NVIDIA-Linux/libGLESv1_CM_nvidia.so.#VERSION#                        #LIBDIR#
-NVIDIA-Linux/libnvidia-egl-wayland.so.1.0.2                          #LIBDIR#
-NVIDIA-Linux/10_nvidia_wayland.json                                  usr/share/egl/egl_external_platform.d