diff --git a/debian/control b/debian/control
index 1f93c6a..78d06b0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Firmware Testing Team <firmware-testing-team@lists.launchpad.net>
 Uploaders: Colin King <colin.king@ubuntu.com>, Keng-Yu Lin <kengyu@ubuntu.com>, Alex Hung <alex.hung@canonical.com>, Chris Van Hoof <vanhoof@canonical.com>, Ivan Hu <ivan.hu@canonical.com>
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libpcre3-dev (>= 7.8), libjson0-dev (>= 0.9), flex, bison, hardening-wrapper
+Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libpcre3-dev (>= 7.8), libjson0-dev (>= 0.9), flex, bison, hardening-wrapper, dkms
 
 Package: fwts
 Architecture: any
@@ -52,3 +52,10 @@ Description: Firmware Test Suite frontend interface
  This is a dialog based interface designed to provide an easy to use method
  to execute tests via Firmware Test Suite and is also used as the primary 
  interface within Firmware Test Suit live images.
+
+Package: fwts-efi-runtime-dkms
+Architecture: amd64
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}, dkms, linux-headers-generic | linux-headers
+Description: Firmware Test Suite UEFI Runtime Service kernel driver
+ This is a kernel driver for accessing the UEFI Runtime Services.
diff --git a/debian/fwts-efi-runtime-dkms.dkms b/debian/fwts-efi-runtime-dkms.dkms
new file mode 100644
index 0000000..685b189
--- /dev/null
+++ b/debian/fwts-efi-runtime-dkms.dkms
@@ -0,0 +1,6 @@
+PACKAGE_NAME="fwts-efi-runtime-dkms"
+PACKAGE_VERSION="#MODULE_VERSION#"
+MAKE[0]="make"
+BUILT_MODULE_NAME[0]="efi_runtime"
+DEST_MODULE_LOCATION[0]="/updates"
+AUTOINSTALL="yes"
diff --git a/debian/rules b/debian/rules
index 4af7a4f..bee26be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,24 @@
 
 export DEB_BUILD_HARDENING=1
 
+DEBVERS := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \
+		| cut -d- -f1)
+
+VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
+
+DKMS_SRC_DIR := $(CURDIR)/debian/fwts-efi-runtime-dkms/usr/src/fwts-efi-runtime-dkms-$(VERSION)
+
+override_dh_auto_install:
+	install -d $(DKMS_SRC_DIR)
+	cp -a efi_runtime/* $(DKMS_SRC_DIR)
+	dh_auto_install
+
 override_dh_auto_configure:
 	autoreconf -ivf
 	dh_auto_configure
 
+override_dh_dkms:
+	dh_dkms -V $(VERSION)
+
 %:
-	dh $@
+	dh $@ --with dkms