diff --git a/www/kore/Makefile b/www/kore/Makefile
index eaff485c385..a97192ae8ea 100644
--- a/www/kore/Makefile
+++ b/www/kore/Makefile
@@ -1,7 +1,6 @@
 COMMENT =	web application framework for writing scalable web APIs in C
 
-DISTNAME =	kore-4.1.0
-REVISION =	2
+DISTNAME =	kore-4.2.1
 
 CATEGORIES =	www
 
diff --git a/www/kore/distinfo b/www/kore/distinfo
index 15909bb0f3c..951c73c695c 100644
--- a/www/kore/distinfo
+++ b/www/kore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kore-4.1.0.tar.gz) = t9c7AF/eDqAcNWpU5LvYogmk3/nPMVgCoSfOcmfvvmE=
-SIZE (kore-4.1.0.tar.gz) = 1068382
+SHA256 (kore-4.2.1.tar.gz) = 92sQik7vonyJEj9daja0k7Fx5Cm+eoXT3RRmrIfn8Vo=
+SIZE (kore-4.2.1.tar.gz) = 1085374
diff --git a/www/kore/patches/patch-Makefile b/www/kore/patches/patch-Makefile
index 6124e9f2d1f..3ecf63c262b 100644
--- a/www/kore/patches/patch-Makefile
+++ b/www/kore/patches/patch-Makefile
@@ -13,8 +13,8 @@ Index: Makefile
 +MAN_DIR?=$(PREFIX)/man
  SHARE_DIR=$(PREFIX)/share/kore
  INCLUDE_DIR=$(PREFIX)/include/kore
- 
-@@ -28,10 +28,9 @@ S_SRC=	src/kore.c src/buf.c src/config.c src/connectio
+ TLS_BACKEND?=openssl
+@@ -30,10 +30,10 @@ S_SRC+= src/tls_$(TLS_BACKEND).c
  FEATURES=
  FEATURES_INC=
  
@@ -22,11 +22,12 @@ Index: Makefile
 +CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes
  CFLAGS+=-Wmissing-declarations -Wshadow -Wpointer-arith -Wcast-qual
  CFLAGS+=-Wsign-compare -Iinclude/kore -I$(OBJDIR) -std=c99 -pedantic
--CFLAGS+=-Wtype-limits
+-CFLAGS+=-Wtype-limits -fno-common
++CFLAGS+=-fno-common
  CFLAGS+=-DPREFIX='"$(PREFIX)"' -fstack-protector-all
  
- ifneq ("$(OPENSSL_PATH)", "")
-@@ -53,8 +52,6 @@ endif
+ LDFLAGS+=-rdynamic
+@@ -67,8 +67,6 @@ endif
  
  ifneq ("$(NOOPT)", "")
  	CFLAGS+=-O0
diff --git a/www/kore/patches/patch-src_pgsql_c b/www/kore/patches/patch-src_pgsql_c
deleted file mode 100644
index d20f041735e..00000000000
--- a/www/kore/patches/patch-src_pgsql_c
+++ /dev/null
@@ -1,16 +0,0 @@
-Work with PostgreSQL 14.
-
-Index: src/pgsql.c
---- src/pgsql.c.orig
-+++ src/pgsql.c
-@@ -772,6 +772,10 @@ pgsql_read_result(struct kore_pgsql *pgsql)
- 	}
- 
- 	switch (PQresultStatus(pgsql->result)) {
-+#if PG_VERSION_NUM >= 140000
-+	case PGRES_PIPELINE_SYNC:
-+	case PGRES_PIPELINE_ABORTED:
-+#endif
- 	case PGRES_COPY_OUT:
- 	case PGRES_COPY_IN:
- 	case PGRES_NONFATAL_ERROR:
diff --git a/www/kore/pkg/PLIST b/www/kore/pkg/PLIST
index d183c5731af..5851b26ae30 100644
--- a/www/kore/pkg/PLIST
+++ b/www/kore/pkg/PLIST
@@ -12,6 +12,8 @@ include/kore/pgsql.h
 include/kore/python_api.h
 include/kore/python_methods.h
 include/kore/seccomp.h
+include/kore/sha1.h
+include/kore/sha2.h
 include/kore/tasks.h
 @man man/man1/kodev.1
 share/doc/kore/
@@ -22,6 +24,7 @@ share/kore/
 share/kore/Makefile
 share/kore/RELEASE
 share/kore/features
+share/kore/ffdhe4096.pem
 share/kore/include/
 share/kore/include/kore/
 share/kore/include/kore/acme.h
@@ -34,11 +37,15 @@ share/kore/include/kore/pgsql.h
 share/kore/include/kore/python_api.h
 share/kore/include/kore/python_methods.h
 share/kore/include/kore/seccomp.h
+share/kore/include/kore/sha1.h
+share/kore/include/kore/sha2.h
 share/kore/include/kore/tasks.h
+share/kore/linker
 share/kore/misc/
 share/kore/misc/curl/
 share/kore/misc/curl-extract-opt.sh
 share/kore/misc/curl/python_curlopt.h
+share/kore/misc/ffdhe4096.pem
 share/kore/misc/kore-build/
 share/kore/misc/kore-build/build-curl.sh
 share/kore/misc/kore-build/build-kodev.sh
@@ -69,9 +76,10 @@ share/kore/src/fileref.c
 share/kore/src/http.c
 share/kore/src/json.c
 share/kore/src/jsonrpc.c
-share/kore/src/keymgr.c
+share/kore/src/keymgr_openssl.c
 share/kore/src/kore.c
 share/kore/src/linux.c
+share/kore/src/log.c
 share/kore/src/mem.c
 share/kore/src/module.c
 share/kore/src/msg.c
@@ -79,10 +87,15 @@ share/kore/src/net.c
 share/kore/src/pgsql.c
 share/kore/src/pool.c
 share/kore/src/python.c
+share/kore/src/route.c
 share/kore/src/runtime.c
 share/kore/src/seccomp.c
+share/kore/src/sha1.c
+share/kore/src/sha2.c
 share/kore/src/tasks.c
 share/kore/src/timer.c
+share/kore/src/tls_none.c
+share/kore/src/tls_openssl.c
 share/kore/src/utils.c
 share/kore/src/validator.c
 share/kore/src/websocket.c