diff --git a/debian/changelog b/debian/changelog
index cf194c8bb..6ceae5e39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ linux (4.17.2-1) UNRELEASED; urgency=medium
     (CVE-2018-12232)
   * [x86] virt: vbox: Only copy_from_user the request-header once
     (CVE-2018-12633)
+  * [x86] vboxguest: Enable VBOXGUEST and DRM_VBOXVIDEO as modules
 
   [ Romain Perier ]
   * [x86] Enable DCN 1.0 Raven family (Closes #901349)
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index cb74577c7..14b9bc9e6 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1648,6 +1648,11 @@ CONFIG_RTL8723BS=m
 ##
 CONFIG_RTS5208=m
 
+##
+## file: drivers/staging/vboxvideo/Kconfig
+##
+CONFIG_DRM_VBOXVIDEO=m
+
 ##
 ## file: drivers/staging/vt6656/Kconfig
 ##
@@ -1830,6 +1835,11 @@ CONFIG_FB_HYPERV=m
 ##
 # CONFIG_FB_GEODE is not set
 
+##
+## file: drivers/virt/vboxguest/Kconfig
+##
+CONFIG_VBOXGUEST=m
+
 ##
 ## file: drivers/watchdog/Kconfig
 ##