diff --git a/DEVELOPERS b/DEVELOPERS
index 14ebccc611..a21d443482 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -88,6 +88,7 @@ F:	package/cpp-httplib/
 
 N:	Alexander Shirokov <shirokovalexs@gmail.com>
 F:	package/broot/
+F:	package/kibi/
 F:	package/nnn/
 F:	package/zellij/
 
diff --git a/package/Config.in b/package/Config.in
index 5a19ef6016..af0760536b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2894,6 +2894,7 @@ menu "Text editors and viewers"
 	source "package/bvi/Config.in"
 	source "package/ed/Config.in"
 	source "package/joe/Config.in"
+	source "package/kibi/Config.in"
 	source "package/less/Config.in"
 	source "package/mc/Config.in"
 	source "package/mg/Config.in"
diff --git a/package/kibi/Config.in b/package/kibi/Config.in
new file mode 100644
index 0000000000..6ebb48dda4
--- /dev/null
+++ b/package/kibi/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_KIBI
+	bool "kibi"
+	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
+	select BR2_PACKAGE_HOST_RUSTC
+	help
+	  A configurable text editor with UTF-8 support, incremental
+	  search, syntax highlighting, line numbers and more, written
+	  in less than 1024 lines of Rust with minimal dependencies.
+
+	  https://github.com/ilai-deutel/kibi
+
+if BR2_PACKAGE_KIBI
+
+config BR2_PACKAGE_KIBI_SYNTAX_HIGHLIGHTING
+	bool "syntax highlighting"
+	default y
+	help
+	  Install files to enable syntax highlighting. This option adds
+	  200 KB of data to /usr/share/
+
+endif
diff --git a/package/kibi/kibi.hash b/package/kibi/kibi.hash
new file mode 100644
index 0000000000..a805f75f91
--- /dev/null
+++ b/package/kibi/kibi.hash
@@ -0,0 +1,4 @@
+# Locally generated
+sha256  0a2cdd264fadf455ed919e5d4c12ab25614735dfe0b30895004ce4f3919d7eff  kibi-0.3.1-cargo4.tar.gz
+sha256  53cdcb17642e801f813712b4844293b037c23d4b482004b77c15ae2f36f551c3  LICENSE-MIT
+sha256  8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac  LICENSE-APACHE
diff --git a/package/kibi/kibi.mk b/package/kibi/kibi.mk
new file mode 100644
index 0000000000..24f466ec30
--- /dev/null
+++ b/package/kibi/kibi.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# kibi
+#
+################################################################################
+
+KIBI_VERSION = 0.3.1
+KIBI_SITE = $(call github,ilai-deutel,kibi,v$(KIBI_VERSION))
+KIBI_LICENSE = MIT or Apache-2.0
+KIBI_LICENSE_FILES = LICENSE-MIT LICENSE-APACHE
+
+ifeq ($(BR2_PACKAGE_KIBI_SYNTAX_HIGHLIGHTING),y)
+define KIBI_INSTALL_SYNTAX_HIGHLIGHTING
+	mkdir -p $(TARGET_DIR)/usr/share/kibi/syntax.d
+	cp -dpfr $(@D)/syntax.d/*.ini $(TARGET_DIR)/usr/share/kibi/syntax.d/
+endef
+
+KIBI_POST_INSTALL_TARGET_HOOKS += KIBI_INSTALL_SYNTAX_HIGHLIGHTING
+endif
+
+$(eval $(cargo-package))