diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile
index d327200edff7..ab9c7f606441 100644
--- a/editors/kakoune/Makefile
+++ b/editors/kakoune/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	kakoune
-DISTVERSION=	2021.08.28
+DISTVERSION=	2021.10.28
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/mawww/kakoune/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Modal code editor with a focus on interactivity
 
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC:H}/UNLICENSE
 
 RUN_DEPENDS=	setsid:sysutils/setsid
 
 USES=		compiler:c++17-lang gmake tar:bzip2
 DATADIR=	${PREFIX}/share/kak
 DOCSDIR=	${PREFIX}/share/doc/kak
 PATCH_WRKSRC=	${WRKSRC:H}
 WRKSRC_SUBDIR=	src
 
 OPTIONS_DEFINE=	DEBUG DOCS
 
 DEBUG_MAKE_ARGS=	debug=yes
 DEBUG_MAKE_ARGS_OFF=	debug=no
 
 post-patch:
 	@${REINPLACE_CMD} -e '/-O3/d' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/kak
 
 do-test:
 	@cd ${WRKSRC:H}/test && ${SETENV} LC_ALL=en_US.UTF-8 ./run
 
 .include <bsd.port.mk>
diff --git a/editors/kakoune/distinfo b/editors/kakoune/distinfo
index 7def67f8db58..0eeb99a33f92 100644
--- a/editors/kakoune/distinfo
+++ b/editors/kakoune/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630157133
-SHA256 (kakoune-2021.08.28.tar.bz2) = 6f6ed7dfd8c5723210dbd848708acf03af4b847016fd3ede96b2a89ad32276cb
-SIZE (kakoune-2021.08.28.tar.bz2) = 535791
+TIMESTAMP = 1635400713
+SHA256 (kakoune-2021.10.28.tar.bz2) = 2f4c93871dc31f6281712281a7119928b1d6d6f300dded84b2d3ce0ab27f2126
+SIZE (kakoune-2021.10.28.tar.bz2) = 537860
diff --git a/editors/kakoune/files/patch-src_main.cc b/editors/kakoune/files/patch-src_main.cc
deleted file mode 100644
index 0c4fd9b6f327..000000000000
--- a/editors/kakoune/files/patch-src_main.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/main.cc.orig	2021-10-25 11:31:24 UTC
-+++ src/main.cc
-@@ -1249,8 +1249,12 @@ int main(int argc, char* argv[])
- }
- 
- #if defined(__ELF__)
--asm(R"(
--.pushsection ".debug_gdb_scripts", "MS",@progbits,1
-+#ifdef __arm__
-+# define PROGBITS "%progbits"
-+#else
-+# define PROGBITS "@progbits"
-+#endif
-+asm(".pushsection \".debug_gdb_scripts\", \"MS\"," PROGBITS ",1" R"(
- .byte 4
- .ascii "kakoune-inline-gdb.py\n"
- .ascii "import os.path\n"
diff --git a/editors/kakoune/pkg-plist b/editors/kakoune/pkg-plist
index 82dee1642186..7966fce08031 100644
--- a/editors/kakoune/pkg-plist
+++ b/editors/kakoune/pkg-plist
@@ -1,174 +1,176 @@
 bin/kak
 libexec/kak/kak
 %%PORTDOCS%%%%DOCSDIR%%/README.asciidoc
 %%DATADIR%%/autoload
 %%DATADIR%%/colors/base16.kak
 %%DATADIR%%/colors/default.kak
 %%DATADIR%%/colors/desertex.kak
 %%DATADIR%%/colors/github.kak
 %%DATADIR%%/colors/greyscale.kak
-%%DATADIR%%/colors/gruvbox.kak
+%%DATADIR%%/colors/gruvbox-dark.kak
+%%DATADIR%%/colors/gruvbox-light.kak
 %%DATADIR%%/colors/kaleidoscope-dark.kak
 %%DATADIR%%/colors/kaleidoscope-light.kak
 %%DATADIR%%/colors/lucius.kak
 %%DATADIR%%/colors/palenight.kak
 %%DATADIR%%/colors/plain.kak
 %%DATADIR%%/colors/red-phoenix.kak
 %%DATADIR%%/colors/reeder.kak
 %%DATADIR%%/colors/solarized-dark-termcolors.kak
 %%DATADIR%%/colors/solarized-dark.kak
 %%DATADIR%%/colors/solarized-light-termcolors.kak
 %%DATADIR%%/colors/solarized-light.kak
 %%DATADIR%%/colors/tomorrow-night.kak
 %%DATADIR%%/colors/zenburn.kak
 %%DATADIR%%/doc/buffers.asciidoc
 %%DATADIR%%/doc/changelog.asciidoc
 %%DATADIR%%/doc/command-parsing.asciidoc
 %%DATADIR%%/doc/commands.asciidoc
 %%DATADIR%%/doc/execeval.asciidoc
 %%DATADIR%%/doc/expansions.asciidoc
 %%DATADIR%%/doc/faces.asciidoc
 %%DATADIR%%/doc/faq.asciidoc
 %%DATADIR%%/doc/highlighters.asciidoc
 %%DATADIR%%/doc/hooks.asciidoc
 %%DATADIR%%/doc/keymap.asciidoc
 %%DATADIR%%/doc/keys.asciidoc
 %%DATADIR%%/doc/mapping.asciidoc
 %%DATADIR%%/doc/modes.asciidoc
 %%DATADIR%%/doc/options.asciidoc
 %%DATADIR%%/doc/regex.asciidoc
 %%DATADIR%%/doc/registers.asciidoc
 %%DATADIR%%/doc/scopes.asciidoc
 %%DATADIR%%/kakrc
 %%DATADIR%%/rc/detection/editorconfig.kak
 %%DATADIR%%/rc/detection/file.kak
 %%DATADIR%%/rc/detection/modeline.kak
 %%DATADIR%%/rc/filetype/arch-linux.kak
 %%DATADIR%%/rc/filetype/asciidoc.kak
 %%DATADIR%%/rc/filetype/awk.kak
 %%DATADIR%%/rc/filetype/c-family.kak
 %%DATADIR%%/rc/filetype/cabal.kak
 %%DATADIR%%/rc/filetype/clojure.kak
 %%DATADIR%%/rc/filetype/cmake.kak
 %%DATADIR%%/rc/filetype/coffee.kak
 %%DATADIR%%/rc/filetype/coq.kak
 %%DATADIR%%/rc/filetype/crystal.kak
 %%DATADIR%%/rc/filetype/css.kak
 %%DATADIR%%/rc/filetype/cucumber.kak
 %%DATADIR%%/rc/filetype/cue.kak
 %%DATADIR%%/rc/filetype/d.kak
 %%DATADIR%%/rc/filetype/dart.kak
 %%DATADIR%%/rc/filetype/dhall.kak
 %%DATADIR%%/rc/filetype/diff.kak
 %%DATADIR%%/rc/filetype/dockerfile.kak
 %%DATADIR%%/rc/filetype/elixir.kak
 %%DATADIR%%/rc/filetype/elm.kak
+%%DATADIR%%/rc/filetype/erlang.kak
 %%DATADIR%%/rc/filetype/eruby.kak
 %%DATADIR%%/rc/filetype/etc.kak
 %%DATADIR%%/rc/filetype/exherbo.kak
 %%DATADIR%%/rc/filetype/fennel.kak
 %%DATADIR%%/rc/filetype/fish.kak
 %%DATADIR%%/rc/filetype/fsharp.kak
 %%DATADIR%%/rc/filetype/gas.kak
 %%DATADIR%%/rc/filetype/gdscript.kak
 %%DATADIR%%/rc/filetype/gentoo-linux.kak
 %%DATADIR%%/rc/filetype/git.kak
 %%DATADIR%%/rc/filetype/gluon.kak
 %%DATADIR%%/rc/filetype/go.kak
 %%DATADIR%%/rc/filetype/graphql.kak
 %%DATADIR%%/rc/filetype/haml.kak
 %%DATADIR%%/rc/filetype/haskell.kak
 %%DATADIR%%/rc/filetype/hbs.kak
 %%DATADIR%%/rc/filetype/html.kak
 %%DATADIR%%/rc/filetype/i3.kak
 %%DATADIR%%/rc/filetype/ini.kak
 %%DATADIR%%/rc/filetype/janet.kak
 %%DATADIR%%/rc/filetype/java.kak
 %%DATADIR%%/rc/filetype/javascript.kak
 %%DATADIR%%/rc/filetype/jinja.kak
 %%DATADIR%%/rc/filetype/json.kak
 %%DATADIR%%/rc/filetype/julia.kak
 %%DATADIR%%/rc/filetype/just.kak
 %%DATADIR%%/rc/filetype/kakrc.kak
 %%DATADIR%%/rc/filetype/kickstart.kak
 %%DATADIR%%/rc/filetype/kotlin.kak
 %%DATADIR%%/rc/filetype/latex.kak
 %%DATADIR%%/rc/filetype/ledger.kak
 %%DATADIR%%/rc/filetype/lisp.kak
 %%DATADIR%%/rc/filetype/lua.kak
 %%DATADIR%%/rc/filetype/mail.kak
 %%DATADIR%%/rc/filetype/makefile.kak
 %%DATADIR%%/rc/filetype/markdown.kak
 %%DATADIR%%/rc/filetype/mercurial.kak
 %%DATADIR%%/rc/filetype/mercury.kak
 %%DATADIR%%/rc/filetype/meson.kak
 %%DATADIR%%/rc/filetype/mlb.kak
 %%DATADIR%%/rc/filetype/moon.kak
 %%DATADIR%%/rc/filetype/nim.kak
 %%DATADIR%%/rc/filetype/ninja.kak
 %%DATADIR%%/rc/filetype/nix.kak
 %%DATADIR%%/rc/filetype/ocaml.kak
 %%DATADIR%%/rc/filetype/pascal.kak
 %%DATADIR%%/rc/filetype/perl.kak
 %%DATADIR%%/rc/filetype/php.kak
 %%DATADIR%%/rc/filetype/pony.kak
 %%DATADIR%%/rc/filetype/protobuf.kak
 %%DATADIR%%/rc/filetype/pug.kak
 %%DATADIR%%/rc/filetype/purescript.kak
 %%DATADIR%%/rc/filetype/python.kak
 %%DATADIR%%/rc/filetype/r.kak
 %%DATADIR%%/rc/filetype/ragel.kak
 %%DATADIR%%/rc/filetype/restructuredtext.kak
 %%DATADIR%%/rc/filetype/ruby.kak
 %%DATADIR%%/rc/filetype/rust.kak
 %%DATADIR%%/rc/filetype/sass.kak
 %%DATADIR%%/rc/filetype/scala.kak
 %%DATADIR%%/rc/filetype/scheme.kak
 %%DATADIR%%/rc/filetype/scss.kak
 %%DATADIR%%/rc/filetype/sh.kak
 %%DATADIR%%/rc/filetype/sml.kak
 %%DATADIR%%/rc/filetype/sql.kak
 %%DATADIR%%/rc/filetype/svelte.kak
 %%DATADIR%%/rc/filetype/swift.kak
 %%DATADIR%%/rc/filetype/systemd.kak
 %%DATADIR%%/rc/filetype/taskpaper.kak
 %%DATADIR%%/rc/filetype/terraform.kak
 %%DATADIR%%/rc/filetype/toml.kak
 %%DATADIR%%/rc/filetype/troff.kak
 %%DATADIR%%/rc/filetype/tupfile.kak
 %%DATADIR%%/rc/filetype/vhdl.kak
 %%DATADIR%%/rc/filetype/void-linux.kak
 %%DATADIR%%/rc/filetype/yaml.kak
 %%DATADIR%%/rc/filetype/zig.kak
 %%DATADIR%%/rc/tools/autorestore.asciidoc
 %%DATADIR%%/rc/tools/autorestore.kak
 %%DATADIR%%/rc/tools/autowrap.kak
 %%DATADIR%%/rc/tools/clang.kak
 %%DATADIR%%/rc/tools/comment.kak
 %%DATADIR%%/rc/tools/ctags.kak
 %%DATADIR%%/rc/tools/doc.asciidoc
 %%DATADIR%%/rc/tools/doc.kak
 %%DATADIR%%/rc/tools/format.kak
 %%DATADIR%%/rc/tools/git.kak
 %%DATADIR%%/rc/tools/go/gopls.kak
 %%DATADIR%%/rc/tools/grep.kak
 %%DATADIR%%/rc/tools/lint.asciidoc
 %%DATADIR%%/rc/tools/lint.kak
 %%DATADIR%%/rc/tools/make.kak
 %%DATADIR%%/rc/tools/man.kak
 %%DATADIR%%/rc/tools/python/jedi.kak
 %%DATADIR%%/rc/tools/rust/racer.kak
 %%DATADIR%%/rc/tools/spell.kak
 %%DATADIR%%/rc/windowing/detection.kak
 %%DATADIR%%/rc/windowing/iterm.kak
 %%DATADIR%%/rc/windowing/kitty.kak
 %%DATADIR%%/rc/windowing/new-client.kak
 %%DATADIR%%/rc/windowing/repl/dtach.kak
 %%DATADIR%%/rc/windowing/repl/kitty.kak
 %%DATADIR%%/rc/windowing/repl/tmux.kak
 %%DATADIR%%/rc/windowing/repl/x11.kak
 %%DATADIR%%/rc/windowing/screen.kak
 %%DATADIR%%/rc/windowing/tmux.kak
 %%DATADIR%%/rc/windowing/wayland.kak
 %%DATADIR%%/rc/windowing/x11.kak
 share/man/man1/kak.1.gz