diff -Nru nvidia-graphics-drivers-430-430.40/debian/changelog nvidia-graphics-drivers-430-430.40/debian/changelog
--- nvidia-graphics-drivers-430-430.40/debian/changelog	2019-07-31 06:04:16.000000000 +0000
+++ nvidia-graphics-drivers-430-430.40/debian/changelog	2019-08-20 13:23:03.000000000 +0000
@@ -1,8 +1,27 @@
-nvidia-graphics-drivers-430 (430.40-0ubuntu0~gpu19.10.1) eoan; urgency=medium
+nvidia-graphics-drivers-430 (430.40-0ubuntu2) eoan; urgency=medium
 
-  * New upstream release
+  * debian/templates/dkms_nvidia.conf.in:
+    - Disable disable_fstack-clash-protection_fcf-protection.patch
+      now that the flags are passed directly in the kernel builds.
 
- -- Rico Tzschichholz <ricotz@ubuntu.com>  Wed, 31 Jul 2019 08:04:16 +0200
+ -- Alberto Milone <alberto.milone@canonical.com>  Tue, 20 Aug 2019 15:23:03 +0200
+
+nvidia-graphics-drivers-430 (430.40-0ubuntu1) eoan; urgency=medium
+
+  * New upstream release:
+    - Added support for the following GPUs:
+        GeForce RTX 2080 SUPER
+        Quadro RTX 3000 with Max-Q Design
+    - Fixed a driver installation failure in Linux kernel
+      configurations with CONFIG_HOTPLUG_CPU.
+    - Updated nvidia-bug-report.sh to search the systemd journal for
+      gdm-x-session logs.
+  * debian/templates/control:
+    - Rearrange the CUDA dependencies.
+  * debian/templates/dkms_nvidia.conf.in:
+    - Remove leftover #.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Wed, 31 Jul 2019 13:00:36 +0200
 
 nvidia-graphics-drivers-430 (430.34-0ubuntu2) eoan; urgency=medium
 
diff -Nru nvidia-graphics-drivers-430-430.40/debian/control nvidia-graphics-drivers-430-430.40/debian/control
--- nvidia-graphics-drivers-430-430.40/debian/control	2019-07-31 06:04:16.000000000 +0000
+++ nvidia-graphics-drivers-430-430.40/debian/control	2019-08-20 13:23:03.000000000 +0000
@@ -110,18 +110,19 @@
 Multi-Arch: same
 Depends:
   ${misc:Depends}, ${shlibs:Depends}
-Provides: nvidia-opencl-icd, opencl-icd, libcuda-5.0-1, libcuda-5.5-1,
- libcuda-6.0-1, libcuda-6.5-1, libcuda-7.0-1, libcuda-7.5-1, libcuda-8.0-1,
- libcuda-9.0-1, libcuda-9.1-1, libcuda-9.2-1, libcuda-10.0-1, libcuda-10.1-1,
- libcuda1 (= ${source:Version}),
- libnvidia-ml1 (= ${source:Version})
-Conflicts: nvidia-opencl-icd, libcuda-5.0-1, libcuda-5.5-1,
- libcuda-6.0-1, libcuda-6.5-1, libcuda-7.0-1, libcuda-7.5-1, libcuda-8.0-1,
- libcuda-9.0-1, libcuda-9.1-1, libcuda-9.2-1, libcuda-10.0-1, libcuda-10.1-1
-Replaces: nvidia-opencl-icd, libcuda-5.0-1, libcuda-5.5-1,
- libcuda-6.0-1, libcuda-6.5-1, libcuda-7.0-1, libcuda-7.5-1, libcuda-8.0-1,
- libcuda-9.0-1, libcuda-9.1-1, libcuda-9.2-1, libcuda-10.0-1, libcuda-10.1-1,
- libnvidia-compute-430 (<< 390.25-0ubuntu2~)
+Provides: nvidia-opencl-icd, opencl-icd, libnvidia-ml1 (= ${source:Version}),
+ libcuda-5.0-1, libcuda-5.5-1, libcuda-6.0-1, libcuda-6.5-1,
+ libcuda-7.0-1, libcuda-7.5-1, libcuda-8.0-1, libcuda-9.0-1,
+ libcuda-9.1-1, libcuda-9.2-1, libcuda-10.0-1, libcuda-10.1-1,
+ libcuda1 (= ${source:Version})
+Conflicts: nvidia-opencl-icd,
+ libcuda-5.0-1, libcuda-5.5-1, libcuda-6.0-1, libcuda-6.5-1,
+ libcuda-7.0-1, libcuda-7.5-1, libcuda-8.0-1, libcuda-9.0-1,
+ libcuda-9.1-1, libcuda-9.2-1, libcuda-10.0-1, libcuda-10.1-1
+Replaces: nvidia-opencl-icd, libnvidia-compute-430 (<< 390.25-0ubuntu2~),
+ libcuda-5.0-1, libcuda-5.5-1, libcuda-6.0-1, libcuda-6.5-1,
+ libcuda-7.0-1, libcuda-7.5-1, libcuda-8.0-1, libcuda-9.0-1,
+ libcuda-9.1-1, libcuda-9.2-1, libcuda-10.0-1, libcuda-10.1-1
 Description: NVIDIA libcompute package
  This package provides a set of libraries which enable the NVIDIA driver
  to use GPUs for parallel general purpose computation through CUDA and
diff -Nru nvidia-graphics-drivers-430-430.40/debian/dkms_nvidia.conf nvidia-graphics-drivers-430-430.40/debian/dkms_nvidia.conf
--- nvidia-graphics-drivers-430-430.40/debian/dkms_nvidia.conf	2019-07-31 06:04:16.000000000 +0000
+++ nvidia-graphics-drivers-430-430.40/debian/dkms_nvidia.conf	2019-08-20 13:23:03.000000000 +0000
@@ -1,4 +1,4 @@
-PACKAGE_NAME="nvidia#"
+PACKAGE_NAME="nvidia"
 PACKAGE_VERSION="430.40"
 CLEAN="make clean"
 BUILT_MODULE_NAME[0]="nvidia"
@@ -12,6 +12,6 @@
 BUILT_MODULE_NAME[2]="nvidia-drm"
 DEST_MODULE_LOCATION[2]="/kernel/drivers/char/drm"
 AUTOINSTALL="yes"
-PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch"
+#PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch"
 #PATCH[1]="buildfix_kernel_4.9.patch"
 #PATCH_MATCH[0]="^4.[6-7]"
diff -Nru nvidia-graphics-drivers-430-430.40/debian/templates/control.in nvidia-graphics-drivers-430-430.40/debian/templates/control.in
--- nvidia-graphics-drivers-430-430.40/debian/templates/control.in	2019-07-10 13:11:32.000000000 +0000
+++ nvidia-graphics-drivers-430-430.40/debian/templates/control.in	2019-08-16 10:25:48.000000000 +0000
@@ -110,18 +110,19 @@
 Multi-Arch: same
 Depends:
   ${misc:Depends}, ${shlibs:Depends}
-Provides: nvidia-opencl-icd, opencl-icd, libcuda-5.0-1, libcuda-5.5-1,
- libcuda-6.0-1, libcuda-6.5-1, libcuda-7.0-1, libcuda-7.5-1, libcuda-8.0-1,
- libcuda-9.0-1, libcuda-9.1-1, libcuda-9.2-1, libcuda-10.0-1, libcuda-10.1-1,
- libcuda1 (= ${source:Version}),
- libnvidia-ml1 (= ${source:Version})
-Conflicts: nvidia-opencl-icd, libcuda-5.0-1, libcuda-5.5-1,
- libcuda-6.0-1, libcuda-6.5-1, libcuda-7.0-1, libcuda-7.5-1, libcuda-8.0-1,
- libcuda-9.0-1, libcuda-9.1-1, libcuda-9.2-1, libcuda-10.0-1, libcuda-10.1-1
-Replaces: nvidia-opencl-icd, libcuda-5.0-1, libcuda-5.5-1,
- libcuda-6.0-1, libcuda-6.5-1, libcuda-7.0-1, libcuda-7.5-1, libcuda-8.0-1,
- libcuda-9.0-1, libcuda-9.1-1, libcuda-9.2-1, libcuda-10.0-1, libcuda-10.1-1,
- libnvidia-compute-#FLAVOUR# (<< 390.25-0ubuntu2~)
+Provides: nvidia-opencl-icd, opencl-icd, libnvidia-ml1 (= ${source:Version}),
+ libcuda-5.0-1, libcuda-5.5-1, libcuda-6.0-1, libcuda-6.5-1,
+ libcuda-7.0-1, libcuda-7.5-1, libcuda-8.0-1, libcuda-9.0-1,
+ libcuda-9.1-1, libcuda-9.2-1, libcuda-10.0-1, libcuda-10.1-1,
+ libcuda1 (= ${source:Version})
+Conflicts: nvidia-opencl-icd,
+ libcuda-5.0-1, libcuda-5.5-1, libcuda-6.0-1, libcuda-6.5-1,
+ libcuda-7.0-1, libcuda-7.5-1, libcuda-8.0-1, libcuda-9.0-1,
+ libcuda-9.1-1, libcuda-9.2-1, libcuda-10.0-1, libcuda-10.1-1
+Replaces: nvidia-opencl-icd, libnvidia-compute-#FLAVOUR# (<< 390.25-0ubuntu2~),
+ libcuda-5.0-1, libcuda-5.5-1, libcuda-6.0-1, libcuda-6.5-1,
+ libcuda-7.0-1, libcuda-7.5-1, libcuda-8.0-1, libcuda-9.0-1,
+ libcuda-9.1-1, libcuda-9.2-1, libcuda-10.0-1, libcuda-10.1-1
 Description: NVIDIA libcompute package
  This package provides a set of libraries which enable the NVIDIA driver
  to use GPUs for parallel general purpose computation through CUDA and
diff -Nru nvidia-graphics-drivers-430-430.40/debian/templates/dkms_nvidia.conf.in nvidia-graphics-drivers-430-430.40/debian/templates/dkms_nvidia.conf.in
--- nvidia-graphics-drivers-430-430.40/debian/templates/dkms_nvidia.conf.in	2019-07-10 13:11:32.000000000 +0000
+++ nvidia-graphics-drivers-430-430.40/debian/templates/dkms_nvidia.conf.in	2019-08-20 13:21:06.000000000 +0000
@@ -1,4 +1,4 @@
-PACKAGE_NAME="nvidia#"
+PACKAGE_NAME="nvidia"
 PACKAGE_VERSION="#VERSION#"
 CLEAN="make clean"
 BUILT_MODULE_NAME[0]="nvidia"
@@ -12,6 +12,6 @@
 BUILT_MODULE_NAME[2]="nvidia-drm"
 DEST_MODULE_LOCATION[2]="/kernel/drivers/char/drm"
 AUTOINSTALL="yes"
-PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch"
+#PATCH[0]="disable_fstack-clash-protection_fcf-protection.patch"
 #PATCH[1]="buildfix_kernel_4.9.patch"
 #PATCH_MATCH[0]="^4.[6-7]"