diff --git a/debian/control b/debian/control
index ae33425..596def6 100644
--- a/debian/control
+++ b/debian/control
@@ -73,6 +73,19 @@ Description: Data Plane Development Kit (igb uio dkms)
  in user-space and communicate directly with dedicated network interfaces.
  This package contains the source code for the igb_uio kernel module.
 
+Package: dpdk-rte-kni-dkms
+Section: kernel
+Architecture: amd64 arm64 i386
+Depends: dkms,
+         dpdk-dev (= ${binary:Version}),
+         libdpdk-dev (= ${binary:Version}),
+         make,
+         ${misc:Depends}
+Description: Data Plane Development Kit (kni dkms)
+ DPDK is a set of libraries for fast packet processing. Applications run
+ in user-space and communicate directly with dedicated network interfaces.
+ This package contains the source code for the igb_uio kernel module.
+
 Package: libdpdk-dev
 Section: libdevel
 Architecture: amd64 arm64 i386
diff --git a/debian/dpdk-rte-kni-dkms.dkms b/debian/dpdk-rte-kni-dkms.dkms
new file mode 100644
index 0000000..35b833b
--- /dev/null
+++ b/debian/dpdk-rte-kni-dkms.dkms
@@ -0,0 +1,7 @@
+PACKAGE_NAME="dpdk-rte-kni"
+PACKAGE_VERSION="#MODULE_VERSION#"
+BUILT_MODULE_NAME[0]="rte_kni"
+MAKE="source /usr/share/dpdk/dpdk-sdk-env.sh; make"
+CLEAN="source /usr/share/dpdk/dpdk-sdk-env.sh; make clean"
+DEST_MODULE_LOCATION[0]="/updates/dkms"
+AUTOINSTALL="YES"
diff --git a/debian/patches/series b/debian/patches/series
index baab84f..e253fd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+ubuntu-fix-rte-kni-makefile-include.patch
 ubuntu-backport-33-vhost-user-add-error-handling-for-fd-1023.patch
 ubuntu-backport-38-dpdk-dev-Memory-leak-when-adding-removing-vhost_user-ports.patch
 ubuntu-fix-vhost-user-socket-permission.patch
diff --git a/debian/patches/ubuntu-fix-rte-kni-makefile-include.patch b/debian/patches/ubuntu-fix-rte-kni-makefile-include.patch
new file mode 100644
index 0000000..c20a15a
--- /dev/null
+++ b/debian/patches/ubuntu-fix-rte-kni-makefile-include.patch
@@ -0,0 +1,15 @@
+Index: dpdk-debian-upstream/lib/librte_eal/linuxapp/kni/Makefile
+===================================================================
+--- dpdk-debian-upstream.orig/lib/librte_eal/linuxapp/kni/Makefile
++++ dpdk-debian-upstream/lib/librte_eal/linuxapp/kni/Makefile
+@@ -40,8 +40,8 @@ MODULE = rte_kni
+ # CFLAGS
+ #
+ MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=50
+-MODULE_CFLAGS += -I$(RTE_OUTPUT)/include -I$(SRCDIR)/ethtool/ixgbe -I$(SRCDIR)/ethtool/igb
+-MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
++MODULE_CFLAGS += -I$(RTE_INCLUDE)/ -I$(SRCDIR)/ethtool/ixgbe -I$(SRCDIR)/ethtool/igb
++MODULE_CFLAGS += -include $(RTE_INCLUDE)/rte_config.h
+ MODULE_CFLAGS += -Wall -Werror
+ 
+ ifeq ($(shell lsb_release -si 2>/dev/null),Ubuntu)
diff --git a/debian/rules b/debian/rules
index da582cd..e8bf409 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,6 +155,10 @@ binary-arch:
 	mkdir -p debian/dpdk-igb-uio-dkms/usr/src/dpdk-igb-uio-$(VERSION)
 	cp lib/librte_eal/linuxapp/igb_uio/* \
 		debian/dpdk-igb-uio-dkms/usr/src/dpdk-igb-uio-$(VERSION)
+	# Package: dpdk-rte-kni-dkms
+	mkdir -p debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(VERSION)
+	cp -a lib/librte_eal/linuxapp/kni/* \
+		debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(VERSION)
 	dh_dkms -V $(VERSION)
 	dh_python2
 	dh_perl