diff --git a/hardware/virtualization/virtualbox/actions.py b/hardware/virtualization/virtualbox/actions.py
index a57fad60b3..4d0631d2a6 100644
--- a/hardware/virtualization/virtualbox/actions.py
+++ b/hardware/virtualization/virtualbox/actions.py
@@ -36,6 +36,24 @@ def build():
     shelltools.system("source %s/env.sh && kmk" % get.curDIR())
 
 def install():
+    # dkms packages
+    with open("env.sh") as f:
+        for l in f.readlines():
+            if l.startswith("BUILD_PLATFORM_ARCH"):
+                a = l.split("=")[1].strip()[1:-1]
+                break
+
+    pisitools.dosed("dkms.conf", "@VERSION@", get.srcVERSION())
+    pisitools.dosed("dkms-guest.conf", "@VERSION@", get.srcVERSION())
+
+    pisitools.insinto("/usr/src/%s-%s" % (get.srcNAME(), get.srcVERSION()), "out/linux.%s/release/bin/src/*" % a)
+    pisitools.insinto("/usr/src/%s-%s" % (get.srcNAME(), get.srcVERSION()), "include")
+    pisitools.insinto("/usr/src/%s-%s" % (get.srcNAME(), get.srcVERSION()), "dkms.conf")
+
+    pisitools.insinto("/usr/src/%s-guest-%s" % (get.srcNAME(), get.srcVERSION()), "out/linux.%s/release/bin/additions/src/*" % a)
+    pisitools.insinto("/usr/src/%s-guest-%s" % (get.srcNAME(), get.srcVERSION()), "dkms-guest.conf", "dkms.conf")
+
+
     shelltools.system("awk '$1 ~ /Version:/ { print gensub(/([0-9]+)\.([0-9]+).*/, \"\\\\1\\\\2\", \"g\", $2) }' /usr/lib/pkgconfig/xorg-server.pc > XorgVersion")
     with open("XorgVersion", "r") as f:
         XorgVersion = f.readline().strip()
diff --git a/hardware/virtualization/virtualbox/files/dkms-guest.conf b/hardware/virtualization/virtualbox/files/dkms-guest.conf
new file mode 100644
index 0000000000..760b69fc71
--- /dev/null
+++ b/hardware/virtualization/virtualbox/files/dkms-guest.conf
@@ -0,0 +1,31 @@
+## @file
+# Linux DKMS config script for the VirtualBox guest kernel modules
+#
+
+#
+# Copyright (C) 2006-2015 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PACKAGE_NAME="vboxguest"
+PACKAGE_VERSION=@VERSION@
+AUTOINSTALL=yes
+
+BUILT_MODULE_NAME[0]="vboxguest"
+BUILT_MODULE_LOCATION[0]="vboxguest"
+DEST_MODULE_LOCATION[0]="/extra"
+
+BUILT_MODULE_NAME[1]="vboxsf"
+BUILT_MODULE_LOCATION[1]="vboxsf"
+DEST_MODULE_LOCATION[1]="/extra"
+
+BUILT_MODULE_NAME[2]="vboxvideo"
+BUILT_MODULE_LOCATION[2]="vboxvideo"
+DEST_MODULE_LOCATION[2]="/extra"
diff --git a/hardware/virtualization/virtualbox/files/dkms.conf b/hardware/virtualization/virtualbox/files/dkms.conf
new file mode 100644
index 0000000000..4e3512e6d9
--- /dev/null
+++ b/hardware/virtualization/virtualbox/files/dkms.conf
@@ -0,0 +1,31 @@
+## @file
+# Linux DKMS config script for the VirtualBox host kernel modules
+#
+
+#
+# Copyright (C) 2006-2015 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PACKAGE_NAME="vboxhost"
+PACKAGE_VERSION=@VERSION@
+AUTOINSTALL=yes
+
+BUILT_MODULE_NAME[0]="vboxdrv"
+BUILT_MODULE_LOCATION[0]="vboxdrv"
+DEST_MODULE_LOCATION[0]="/extra"
+
+BUILT_MODULE_NAME[1]="vboxnetflt"
+BUILT_MODULE_LOCATION[1]="vboxnetflt"
+DEST_MODULE_LOCATION[1]="/extra"
+
+BUILT_MODULE_NAME[2]="vboxnetadp"
+BUILT_MODULE_LOCATION[2]="vboxnetadp"
+DEST_MODULE_LOCATION[2]="/extra"
diff --git a/hardware/virtualization/virtualbox/pspec.xml b/hardware/virtualization/virtualbox/pspec.xml
index 0c6987b402..69ce1dc69a 100644
--- a/hardware/virtualization/virtualbox/pspec.xml
+++ b/hardware/virtualization/virtualbox/pspec.xml
@@ -13,6 +13,10 @@
         <Summary>A powerful virtualization program</Summary>
         <Description>VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things.</Description>
         <Archive sha1sum="405bec87a1c89dbfcd61411312d101e2d8dc1e6b" type="tarbz2">http://download.virtualbox.org/virtualbox/6.1.0/VirtualBox-6.1.0.tar.bz2</Archive>
+        <AdditionalFiles>
+            <AdditionalFile owner="root" permission="0644" target="dkms.conf">dkms.conf</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="dkms-guest.conf">dkms-guest.conf</AdditionalFile>
+        </AdditionalFiles>
         <BuildDependencies>
             <Dependency>dev86</Dependency>
             <Dependency>cdrkit</Dependency>
@@ -98,7 +102,10 @@
             <Dependency>openssl</Dependency>
             <Dependency>device-mapper</Dependency>
             <Dependency>qt5-x11extras</Dependency>
-            <Dependency version="current">module-virtualbox</Dependency>
+            <AnyDependency>
+                <Dependency version="current">module-virtualbox</Dependency>
+                <Dependency version="current">virtualbox-dkms</Dependency>
+            </AnyDependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/etc/vbox</Path>
@@ -136,7 +143,10 @@
             <Dependency>libXdamage</Dependency>
             <Dependency>xorg-server</Dependency>
             <Dependency>libXcomposite</Dependency>
-            <Dependency version="current">module-virtualbox-guest</Dependency>
+            <AnyDependency>
+                <Dependency version="current">module-virtualbox-guest</Dependency>
+                <Dependency version="current">virtualbox-guest-dkms</Dependency>
+            </AnyDependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/etc/X11/xinit/xinitrc.d</Path>
@@ -157,7 +167,42 @@
         </AdditionalFiles>
     </Package>
 
+    <Package>
+        <Name>virtualbox-dkms</Name>
+        <Summary>VirtualBox Host kernel modules sources</Summary>
+        <RuntimeDependencies>
+            <Dependency>dkms</Dependency>
+        </RuntimeDependencies>
+        <Conflicts>
+            <Package>module-virtualbox</Package>
+        </Conflicts>
+        <Files>
+            <Path fileType="data">/usr/src</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>virtualbox-guest-dkms</Name>
+        <Summary>VirtualBox Guest kernel modules sources</Summary>
+        <RuntimeDependencies>
+            <Dependency>dkms</Dependency>
+        </RuntimeDependencies>
+        <Conflicts>
+            <Package>module-virtualbox-guest</Package>
+        </Conflicts>
+        <Files>
+            <Path fileType="data">/usr/src/*-guest-*</Path>
+        </Files>
+    </Package>
+
     <History>
+        <Update release="30">
+            <Date>2020-01-08</Date>
+            <Version>6.1.0</Version>
+            <Comment>Add dkms packages</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin.bojara@gmail.com</Email>
+        </Update>
         <Update release="29">
             <Date>2019-12-24</Date>
             <Version>6.1.0</Version>