diff --git a/kernel/drivers/module-bbswitch/actions.py b/kernel/drivers/module-bbswitch/actions.py
index e82fdced..b9004eb6 100644
--- a/kernel/drivers/module-bbswitch/actions.py
+++ b/kernel/drivers/module-bbswitch/actions.py
@@ -13,10 +13,11 @@ KDIR = kerneltools.getKernelVersion()
 
 def build():
     autotools.make("KDIR=/lib/modules/%s/build" % KDIR)
-    #autotools.make()
 
 def install():
-    #autotools.rawInstall("DESTDIR=%s" % get.installDIR())
     pisitools.insinto("/lib/modules/%s/misc" % KDIR, "bbswitch.ko")
+    pisitools.dosed("dkms/dkms.conf",  "#MODULE_VERSION#", get.srcVERSION())
+    for f in "Makefile bbswitch.c dkms/dkms.conf".split():
+        pisitools.insinto("/usr/src/bbswitch-%s" % get.srcVERSION(), f)
 
     pisitools.dodoc("NEWS", "README*")
diff --git a/kernel/drivers/module-bbswitch/pspec.xml b/kernel/drivers/module-bbswitch/pspec.xml
index a85636de..0d06d6e4 100644
--- a/kernel/drivers/module-bbswitch/pspec.xml
+++ b/kernel/drivers/module-bbswitch/pspec.xml
@@ -23,9 +23,19 @@
         <Name>module-bbswitch</Name>
         <RuntimeDependencies>
             <Dependency version="5.4.8">kernel</Dependency>
+            <Dependency release="current">bbswitch-common</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="library" permanent="true">/lib/modules</Path>
+            <Path fileType="library">/lib/modules</Path>
+        </Files>
+        <Conflicts>
+            <Package>bbswitch-dkms</Package>
+        </Conflicts>
+    </Package>
+
+    <Package>
+        <Name>bbswitch-common</Name>
+        <Files>
             <Path fileType="config">/etc</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
@@ -35,8 +45,29 @@
         </AdditionalFiles>
     </Package>
 
+    <Package>
+        <Name>bbswitch-dkms</Name>
+        <RuntimeDependencies>
+            <Dependency release="current">bbswitch-common</Dependency>
+            <Dependency>dkms</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="data">/usr/src/bbswitch*</Path>
+        </Files>
+        <Conflicts>
+            <Package>module-bbswitch</Package>
+        </Conflicts>
+    </Package>
+
     <History>
-		<Update release="27">
+        <Update release="28">
+            <Date>2020-01-09</Date>
+            <Version>0.8</Version>
+            <Comment>Add dkms support</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin.bojara@gmail.com</Email>
+        </Update>
+        <Update release="27">
             <Date>2019-12-27</Date>
             <Version>0.8</Version>
             <Comment>Rebuild.</Comment>